Tiny cleanup of the CSUnitPicker