nyacc: fixed more CPP issues