Units are now describable.
Merge branch 'private'.