Defer ambiguity test for class members, so that the test is done *after*
we know the (extended) functional dependencies (this is a patch that was
mostly carried over from hugs98, but a few lines were out of place).