Changed the way some on/off switch command line options are treated.