Improve canonicalization
Better expression selection for ordering with non-static term