Redo arg parsers, add test driver.