Code cleanup for join operator.