Restore default arguments for API compatibility

This seems to be all the stuff Ben forgot to uncomment.  I'll keep an eye out for any similar but harder to grep for issues elsewhere.