This paves the way for tracking more state (e.g. error tainting) in the diagnostic context handle
93f0a9a91f