add generic throws parameter, plus remove type parameters from drop-in replacement visitors