Remove second pass for macro expansion