Refactor Strategy#watch_*