Now also simplified the Quantity side, letting Unit take care of strings