Make updating text for conceal mode simpler.  A few compiler warning fixes.
17 files changed