diff --git a/library/io/unix/io.factor b/library/io/unix/io.factor
index 3cbbb993a4..bc1fcc77e9 100644
--- a/library/io/unix/io.factor
+++ b/library/io/unix/io.factor
@@ -199,7 +199,8 @@ M: read1-task task-container drop read-tasks get-global ;
     ] when pending-error ;
 
 M: input-port stream-read1 ( stream -- char/f )
-    dup wait-to-read1 dup port-eof? [ drop f ] [ buffer-pop ] if ;
+    dup wait-to-read1
+    dup port-eof? [ drop f ] [ buffer-pop ] if ;
 
 ! Reading character counts
 : read-step ( count reader -- ? )
diff --git a/vm/mach_signal.c b/vm/mach_signal.c
index 37d1a47716..b87d054e54 100644
--- a/vm/mach_signal.c
+++ b/vm/mach_signal.c
@@ -72,8 +72,8 @@ catch_exception_raise (mach_port_t exception_port,
   save_thread_state = thread_state;
 
   SIGSEGV_PROGRAM_COUNTER (thread_state) = (unsigned long) terminating_handler;
-  pass_arg0(&thread_state,SIGSEGV_EXC_STATE_FAULT(exc_state));
   SIGSEGV_STACK_POINTER (thread_state) = fix_stack_ptr(sp);
+  pass_arg0(&thread_state,SIGSEGV_EXC_STATE_FAULT(exc_state));
 
   /* See http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/thread_set_state.html.  */
   if (thread_set_state (thread, SIGSEGV_THREAD_STATE_FLAVOR,