[PATCH 1/2] Use namedtuple instead of our magic tuples