Highly improved argument parsing. But not near finished.