Re #8382. Move suppression to the right place.