static SS tok_toNonPrimitiveTypes_map = mapFromTokens([[
  int Int
  byte Byte
  float Float
  short Short
  double Double
  long Long
  char Character
  bool Bool
  boolean Bool
]]);

sS tok_toNonPrimitiveTypes(S s) {
  ret join(tok_toNonPrimitiveTypes(javaTok(s)));
}

static L<S> tok_toNonPrimitiveTypes(L<S> tok) {
  for (int i = 1; i < l(tok); i += 2) {
    S t = tok.get(i);
    t = tok_toNonPrimitiveTypes_map.get(t);
    if (t != null && neq(get(tok, i+2), "[")) tok.set(i, t);
  }
  ret tok;
}