Yet more refactoring of generated code; Mostly Property pane