Bug 1084006 - Update to use new CLI arguments.