Add support for various order by types in make_order_by_deterministic