Removes -s (switches) option -- they are now assumed to be present
I still need to shift the old switch