Remove extraneous parameters that were added simply to prevent compiler ICE

We don't need them anymore since we're on gcc 4.9.