Macro syntax changes according to new GPP options