keep just Denotes, add ValueOf as an alias, things should be OK
Merge branch 'enhancement/one/value/class'