Add a TODO about basing this on an `OrderedDict` as soon as we drop Python 2.6 support, and add a note to #344 about it as well.