More matchers.
Print Quantity and Dimensionless correctly.
Factor and cleanup.