Better unit parsing.