Merge "cleanup EditWatchlist a bit"