Implement Watcher buffers (sort of.  Needs a bit of work.)
Much less icky.  Ctrl+D shows a nice "git diff" buffer now.
A few more rewriting rules for quotes and apostrophes.