<Macro Pass 1 : More correct now>