Re #3 convention implemented in parts of the code.