Drop "unit/qualifier-phrase" and rejig "unit/qualifier-mode"

This is the only realistic way to handle spaces, etc. Open question
is I guess whether the space should be variable here.