Fix broken “<single-word> what/who/whom/which?” responses (I swear I tested that…)