Changed to use re-implementation of llvm-cmd argument modifications