Remove DiscreteTypeSet
Fix type calculations of +