Revert back to logic before CorrelateRelationship (0be555eac6847)
Conditionally fallback for rels w/ where attr - #68, #95

In order to accomidate both rels with complex coderef ON and where
attrs, conditional logic has been added which falls back for where to
the old logic but uses the new correlate logic for newer ones.

FIXME!!!