Removed more macros from z80 core.