I could, but I don't believe it's strictly necessary. Mostly, it's just inelegant code. It would have been more work than I wanted to sink to make the change in the TODO, but I think it may be a good idea to do it at some point.

Essentially, I didn't change the format the we return limits in, but that format was based on CachedRateLimits that held maps of methods so it probably should be changed. Even so, the values being returned are accurate and the functionality is still there.