Have make() take a dictionary, rather than list-of-lists.