Disallow None units, and add DimensionlessUnit wrappers