#916 Extending coding conventions even more