CMS-1377 Honing of Content Data classes
Simplified ValueType code - made more use of generics.