Simplify arg parsing on weave run