Upgraded level ML parsing with CPP macros