Minor adjusts for namedtuple current usage.