ENG-4284 tweak to avoid false alarms from gcc