Purely stylistic improvements

Two separate things that I think can be made more readable, see commit messages for details.