Also, you need an edge-case for where there's an `extra_order_by`, right?