Convert more hard-coded options to command line options
Fix W argument name. Update ignore.