Use dicts not named tuples

We are deployed into 2.5, which lacks things like namedtuples. As such we have
to use dicts here instead.