Don't automatically instantiate dictionaries, rename instantiation commands