replace hints with kinds in parser as well