> Which means I have to prime these before-change to avoid parsing the
 > buffer twice.  Darn it!
 > So a fix for both has to hook into post-self-insert and after-change.

I attach a preliminary patch that should work for both.  Please give it
some testing.

martin