Attempt to make surface continuity test more generic.