Refactor the label mapper to be more like the lister.