Clean up joins.
Add the Trace benchmark.