[I7] Phrases involving kinds

Regarding 1 and 2, my earlier reply to Victor somewhat addresses both points, at the cost of introducing dead code. I’m not quite sure if it’s what you want.