Out of curiosity, is there a significant reason for having a separate ``_odict_py2.py`` file?  After these changes, this file is nearly empty...