Replaced BareValueType with plain ValueType