Watcher: use more idiomatic parameter names.
Watcher: have States prealloc the map copy that is returned.