Minor coding guidelines tweaks ...