context.js: squash two heisenbugs
context.js: less clutter, more explicitly