Small cosmetic changes inspired by @cholm.
Hi @cholm, please have a look at the pieces of your !291 MR that can be put in immediately.