simplify Context implementation and make it more direct
fix bug with context unload race condition that frequently caused queries to never be unsubscribed properly
consistent whitespace