changed the EPlus rule in CPP.cf to EAdd since that's its name
in the Haskell code