Simplified code path for single-user cases

[alanning]

Filters and updates get understandably complex when having to deal with multiple users.

Let's add a code path for the single-user cases. This is the most common usage pattern and will avoid the need for things like aggregation in the simple case.