Bring params in line with tokens (first of each used) as per RFC