reducing the scope of the supress warning annotations