Change values list to be label-centric

Read b9289f9 for details.