[[ IfDefLegacyExec ]] A couple more tweaks (missed first time round).