follow-up to r85876: fix some coding style issues (some of which were not introduced...