Progress towards a combinator library for units.