Cleanup some more left-overs from removing `DictObject`.