Need names, not just values: refactor to use maps.