Revert 8e53443f3333ce907d3c78647036d5bb36a96aaf - adding default cases

Too noisy for unreachable code.