Implement missing standard units, and fix measurement unit parsing.