Removed VM #define
Immediate value macros no longer macros
Clean up code & output
Cosmetic tweaks