Improve switch behavior in no_quit