I'm surprised it made a review link.  It didn't apply cleanly for me here.

While merging I noticed that the imperative declension fix had snuck out of the diff somehow.  So I redid that.

Attached is an updated patch.


Also I should mention: clinic.py currently accepts both the old and new comment format.  I'll leave support for the old one in until just before the last release candidate.