Reduce scope of warning suppression.