Change time-based scopes in the survey model to use lambdas.

- So they're evaluated every time they're called
Merge branch 'master' into caching-experiments