More work on unit-parsing