This undoes commit 11565, "workaround for archaic T202 g++ bug" which doesn't actually seem to be necessary for T202 compilation. It also replaces 'typename' with 'class', for another compiler. Modification provided by Dirk Zimoch.