Restore non-rewrite circular NTA condition

The circular NTA condition needs to be different for rewrite and non-rewrite
attributes, because the rewrite circular NTA uses the rewrite condition and
non-rewrite circular NTAs need to compare the result trees.