And the second part is rename so that it reflect reality
that single value can actually track multiple values.

Patch can bootstrap on x86_64-linux-gnu and survives regression tests.

Ready to be installed?
Thanks,
Martin