Tweaked the macro and its vars.