Improve debug code generated for calls to the built-in context methods