Eliminate ValueType enum, to shave 2k of the jar