Most of the work is the same regardless of relation type, so bring
those parts out of the relation type test.