PUB-837: Simplify unit handling a bit.