Convert command line option processing code over to use the syntax supported