generator: do not inline getters and setters
dia: cosmetic changes to diagram