Replace mutable defaults with nonmutables

Using mutables (dictionaries, lists, etc) as defaults in Python function or method declarations can lead to some really hard to debug race conditions. I switched two methods to use `None` as the default.