Inspect impl for Entry, simplify tests
Restore PickSet to be a list

PickSet as a HashSet wasn't giving us reliable keys, so using lists and
uniq'ing instead