Simplify checkWatched, and remove unused checkWatchedInt.