Remove CF_DATATYPES, make DataTypeTo/FromString consistent.

These were previously using different string sets.