Add support for `unit` (i.e. virtually merge #6)