Some more changes improving code style conformance and code size.