- Changed the way default arguments are handled to be more sensible