Macro fixes for varying input expressions