Eliminate some uses of mutable default args

See: GH-2163