Make composite and base units equivalent.
Merge pull request #2382 from mdboom/unit/composite-compose

The identity of composite and irreducible units does not match.