Factored out watch methods to ASimulator. Refactore subtrees.