Fix the non-DEVELOPER case of my macro madness...