Fix handling of integers in watch.

This PR re-introduces a change originally introduced in #3454, to correct the handling of integers in watches. It was later removed to get #3472 to work.

PTAL:
- [x] @lukechurch