Commenting semi-broken

I've definitely broken commenting for my (few) commenters who use TypeKey. Regular commenting seems to be working OK, but I'm guessing I'll break it, too, before I'm finished fixing everything.