nyacc: more CPP fixes