[[ IfDefLegacyExec ]] Further tweaks to eliminate false positives.