static L<S> javaTokWithAngleBracketsC_addNumbers(S pat) {
  L<S> tok = javaTokWithAngleBracketsC(pat);
  new Map<S, Int> seen;
  for i over tok: {
    S t = tok.get(i);
    if (!isAngleBracketed(t)) continue;
    int n = toInt(seen.get(t))+1;
    if (n > 1)
      tok.set(i, dropLast(t) + n + ">");
    seen.put(t, n);
  }
  ret tok;
}