Fix token arguments to accept values with "