I do not deny that a Saint/Doctor can be mistaken, but when he says that a certain doctrine is
de fide, and the contrary proposition temerarious, then it cannot simply be dismissed. Pope Pius XII has settled the case anyway, so there is no grounds for further debate. Also, Pope St. Pius V taught in
Ex Omibus Afflictionibus that justification and supernatural faith and charity cannot be separated from the remission of sins.
It is the positive will of Christ that all receive water Baptism to be saved. So, water Baptism is a necessity. But it is not an absolute necessity, in that those who die without water Baptism through no fault of their own can be saved through supernatural desire for it.
qui crediderit et baptizatus fuerit salvus erit qui vero non crediderit condemnabitur (St. Mark 16,16)
When speaking of those who will be condemned, Christ obviously speaks of those who refuse water Baptism because they do not believe it necessary, not of those who do want to receive it but happen to die before they could even receive an emergency Baptism.
Extra Ecclesiam Nulla Salus is a dogma of the Church, but it must be interpreted the way the Church interprets it.
With regards to the Holy Innocents, they were martyred before the law of baptism was ever even established and made efficacious by Christ's Passion.
According to the false logic of those who rigorously divorce the EENS dogma of it's true meaning, this would also be a violation of the dogma.