sS tok_removeModifier(S s, S modifier) {
  ret join(tok_removeModifier(javaTok(s), modifier));
}

static LS tok_removeModifier(LS tok, S modifier) {
  for (int i : jfindAll(tok, modifier)) {
    tok.set(i, "");
    tok.set(i+1, dropPrefix(" ", tok.get(i+1)));
  }
  ret tok;
}