Tony: fix typo with definition of command line options.
Tony: remove duplicate code for generating Windows gold images.