Fixed compiler to allow non-sequential macros

Kex r1261 import from Kaiser