diff --git a/lang/base.rkt b/lang/base.rkt
index ee25569..b28ae62 100644
--- a/lang/base.rkt
+++ b/lang/base.rkt
@@ -5,18 +5,11 @@
                      ;; Don't publically export the bindings from #%paramz.
                      exception-handler-key
                      parameterization-key
-                     break-enabled-key
-                     
-                     ;; Use the traced app
-                     #;#%app)
+                     break-enabled-key)
+         (all-from-out "private/list.rkt"))
          
-         (all-from-out "private/list.rkt")
-         
-         #;(rename-out [traced-app #%app]))
-
-(require "private/list.rkt"
-         "private/traced-app.rkt")
+(require "private/list.rkt")
 
 
 ;; Kludge: This forces modbeg to be compiled and packaged.
-(require racket/private/modbeg)
\ No newline at end of file
+(require racket/private/modbeg)
diff --git a/lang/reader.rkt b/lang/reader.rkt
index cab4e7e..fd15f95 100644
--- a/lang/reader.rkt
+++ b/lang/reader.rkt
@@ -3,7 +3,7 @@
 ;; http://docs.racket-lang.org/planet/hash-lang-planet.html
 
 #:language (lambda (ip)
-	    `(file ,(path->string base-lang-path)))
+	    `(file ,(path->string whalesong-lang-path)))
 
 (require racket/runtime-path)
-(define-runtime-path base-lang-path "base.rkt")
+(define-runtime-path whalesong-lang-path "whalesong.rkt")
diff --git a/lang/whalesong.rkt b/lang/whalesong.rkt
index 0be3df9..81638b1 100644
--- a/lang/whalesong.rkt
+++ b/lang/whalesong.rkt
@@ -1,4 +1,11 @@
 #lang s-exp "kernel.rkt"
 
-(require "base.rkt")
-(provide (all-from-out "base.rkt"))
\ No newline at end of file
+(require "base.rkt"
+         "traced-app.rkt")
+
+;; Programs written in Whalesong will have tracing enabled by default.
+;; If you don't want this, write in whalesong/base instead.
+
+(provide (except-out (all-from-out "base.rkt")
+                     #%app)
+         (rename-out [traced-app #%app]))
\ No newline at end of file