Add JoinFunctionFixer

Implement #769