further simplify context objects
1 file changed