[ET Trac] #2348: presync branch of McLachlan modifies generated code