I can't imagine a future where this file will get any larger than it already is, so I don't think the added `context` blocks are necessary. I turned down your previous PR with these changes (#2607), and my opinion hasn't changed since then. Would you mind removing these `context` blocks?