Get rid of AssocJoinExpr
Refactor JoinBuilder since we got rid of AssocJoinExpr