svoid tok_typeAO(L<S> tok, Set<S> pairClasses) {
  int n = l(tok)-6;
  bool change = false;
  for (int i = 1; i < n; i += 2) {
    if (!eq(get(tok, i+2), "<")) continue;
    S t = tok.get(i);
    continue unless contains(pairClasses, t);
    if (tok_isSingleTypeArg(tok, i+2)) {
      int j = findEndOfTypeArgs(tok, i+2)-1;
      S type = joinSubList(tok, i+4, j);
      replaceTokens_reTok(tok, i+4, j, type + ", Object");
      change = true;
    }
  }
}

Began life as a copy of #1017378