Assorted nitpicks

Ignore the branches name or this PR's title: it meanwhile became much more than just nitpicks ;-)