Cleaned up some fallthrough cases