Proper macro subst