Revised Tea Time scopes

These should be a bit more composable than the previous adhoc `where` queries. Fixes #87