Started removing macros from z80 core.