Fix #15308 by suppressing invisble args more rigorously