Further code style fixups