diff --git a/make-host-1.lisp b/make-host-1.lisp
index 5f6543c931..fa8cb0ab86 100644
--- a/make-host-1.lisp
+++ b/make-host-1.lisp
@@ -18,7 +18,8 @@
 ;; Supress function/macro redefinition warnings under clisp.
 #+clisp (setf custom:*suppress-check-redefinition* t)
 
-(load-or-cload-xcompiler #'host-cload-stem)
+(with-compilation-unit ()
+  (load-or-cload-xcompiler #'host-cload-stem))
 
 ;;; Let's check that the type system, and various other things, are
 ;;; reasonably sane. (It's easy to spend a long time wandering around
diff --git a/src/code/cross-condition.lisp b/src/code/cross-condition.lisp
index d63fe4854d..fc96e44f9f 100644
--- a/src/code/cross-condition.lisp
+++ b/src/code/cross-condition.lisp
@@ -102,12 +102,3 @@ which can be found at <http://sbcl.sourceforge.net/>.~:@>"
 ;; both of which are specified to exist.
 (define-condition sb!c:inlining-dependency-failure
     (simple-condition style-warning) ())
-
-;; early-extensions seems to want to recognize these types.
-;; I'm not sure that it actually can or needs to. For one thing,
-;; the types didn't used to exist. More than likely the mechanism for handling
-;; deprecated types doesn't actually work in the cross-compiler.
-;; Anyway, the lesser evil is to make a few extra definitions rather than
-;; produce a PARSE-UNKNOWN-TYPE warning in reference to PARSE-UNKNOWN-TYPE.
-(define-condition parse-unknown-type () ())
-(define-condition parse-deprecated-type () ())