Rework multiple-errors one more time

I think I'm finally happy with it.