Miscellaneous coding style fixes