Small code-style fixes, for sniffer conformance.

Nothing major, but makes the phpcs report a bit smaller! :-)