What is this fixing? The switch statement consolidated the many errors we could get to a small subset of meaningful errors. Is there some reason we want the whole gamut now?