Cleaned up case branches in Quantity and Dimension