Stop using a tuple for map entries