Dedup Order class hierarchy
Make sort icons reflect current order
Remove reference to BasicObject, it wasn't introduced until 1.9