Remove extraneous parameters that were added simply to prevent compiler ICE

We don't need them with gcc 4.9