Fix incorrect overriding of passed in/defaulted parameters.