correct two bugs that cannot handle generics: one is in BlockOrStatement and the other one is return type of a method: TypeArgument used Name(), now TypeWithoutSemantics is used instead