Removed all the default values of None, as that is the default of the default variable!
Authored by: bugman 2012-05-07
Parent: [r16036]
Child: [r16038]
