Code conventions (second try).