Add additional ambiguity detection.