There is only one caller, why don't we just change it to always pass in the whole dictionary?  Then you don't have to do the default value dance below.