Work on #332.  Tweak content-assist mode a bit.  It still isn't quite
done but it's functional.