Move all watchlist editing into WatchlistEditor class, integrating "raw editing"...