Actually return a dict with tuples for values, as advertised