- Reduced the scope of some VM macros