Slightly simplify add_args() routine