Automatically pass current context to bindings
A couple minor refactors
Simplify a view store test
Revert "Simplify a view store test"

This reverts commit 3b3358db34807de676dfa71fa7d40c1fa87cb515.