[[ IfDefLegacyExec ]] Tweaks to remove more false positives.