c++: parser cleanup, remove dummy arguments