diff: use skip_to_optional_arg()