Reintroduce "unit/qualifier-phrase"

With the improved font set up, this won't prevent line breaks and makes
more sense than a hard-coded space. Still not sure about 'phrase', but
don't have a better idea!