Inlining begin/end context calls. Required more reorganizations of the header files.