Fix overdeletes from before.  Fix ctags.