Clean-up OrderJoins

Less verbose implementation; still does not produce correct results.