Fix yahoo-style context lookup
2.0.1