Don't clobber default values with null