Remove bogus default parameters.  Not sure why the compiler didn't warn on this.