Revised TimeoutWatcher signature.
Merged TimeoutHydratable and TimeoutWatcher; simplified repository.