CMS-3501 Simplify data value classes. Value does not need to be generic.