Code style conformance tweaks.