Some coding standards improvements.