diff --git a/src/module/repl.wren b/src/module/repl.wren
index 8867176c..b5aaf16c 100644
--- a/src/module/repl.wren
+++ b/src/module/repl.wren
@@ -66,9 +66,7 @@ class Repl {
         // TODO: Handle ESC 0 sequences.
       }
     } else if (byte == Chars.carriageReturn) {
-      var next = executeInput()
-      if (next == Chars.ctrlD) return true
-      if (next != null) handleChar(next)
+      return executeInput()
     } else if (byte == Chars.delete) {
       deleteLeft()
     } else if (byte >= Chars.space && byte <= Chars.tilde) {
@@ -215,13 +213,13 @@ class Repl {
     }
   }
 
-  executeCommand(command, arguments) {
+  executeCommand(command, argument) {
     if (command == Command.clear) {
-      return Chars.ctrlL
+      return this.handleChar(Chars.ctrlL)
     }
 
     if (command == Command.exit) {
-      return Chars.ctrlD
+      return true
     }
 
     if (command == Command.help) {
diff --git a/src/module/repl.wren.inc b/src/module/repl.wren.inc
index fad4313c..79ab5ce9 100644
--- a/src/module/repl.wren.inc
+++ b/src/module/repl.wren.inc
@@ -68,9 +68,7 @@ static const char* replModuleSource =
 "        // TODO: Handle ESC 0 sequences.\n"
 "      }\n"
 "    } else if (byte == Chars.carriageReturn) {\n"
-"      var next = executeInput()\n"
-"      if (next == Chars.ctrlD) return true\n"
-"      if (next != null) handleChar(next)\n"
+"      return executeInput()\n"
 "    } else if (byte == Chars.delete) {\n"
 "      deleteLeft()\n"
 "    } else if (byte >= Chars.space && byte <= Chars.tilde) {\n"
@@ -217,13 +215,13 @@ static const char* replModuleSource =
 "    }\n"
 "  }\n"
 "\n"
-"  executeCommand(command, arguments) {\n"
+"  executeCommand(command, argument) {\n"
 "    if (command == Command.clear) {\n"
-"      return Chars.ctrlL\n"
+"      return this.handleChar(Chars.ctrlL)\n"
 "    }\n"
 "\n"
 "    if (command == Command.exit) {\n"
-"      return Chars.ctrlD\n"
+"      return true\n"
 "    }\n"
 "\n"
 "    if (command == Command.help) {\n"