Add support for --clean and --extraargs arg options