DataType constant clean up.