Better control of macro expansion for reports