adds type arguments to grammar
rebuild