Elminated no longer applicable or soon-to-be eliminated macros.
Moved macros used only in control/debug scenarios to this module.