More resilient arg handling