WIP: Resolve "switch to an unordered map for LabeledValueSet"

Closes #1316

Merge request reports