Tidy up constructor code generation