Add TODOs.
Reorder join to avoid nulls-at-end.