Simplify argument handling