Cleanup of some unneeded brackets in switches, that were creating warnings.