Simplify API to filter on either user or context, but not on both. Cleanup and restructure implementation.