Move the argument list regex up to reusable place