Miscellaneous cleanups

This MR is mostly noise - things that have been already agreed in MR reviews previously or really trivial things.

It does not make sense spending time reviewing it.

cc @whot