Serialize variables relevant to `watch`

Cherry-picked and resolved conflicts with the two relevant commits from modelruns: f3cb262 and cc5522f