refactored watchables mapping for ForRangeStatement