Fix composite join method call typo.
Simplify Query and JoinQuery interfaces.