Eliminate some uses of mutable default args

See: GH-2163
Changed this to use `None` in 962d14d.