Remove extraneous parameters that were added simply to prevent compiler ICE

We don't need them with gcc 4.9
Merge pull request #35 from cmaloney/gcc_49_less_ice

Remove extraneous parameters that were added simply to prevent compiler ICE