Fixing the new relationship()-style queries.