Remove Hashable instances again, add more useful Ord instances