[units]A bit cleaner matching and parsing units.