More work on vim mode.  The dispatcher is getting simpler.  Ditto for key handlers.