Renaming monitors to watchers, plus some other petty perfectionist stuff.