changes in generated macro code