Gets rid of a lingering dependency on the interpreter in common code and a bunch of indirect inclusions.