cpp: re-do proper cpp param filtering