diff --git a/core/alien/compiler/compiler-tests.factor b/core/alien/compiler/compiler-tests.factor
index 3d0f36e415..57bf163443 100755
--- a/core/alien/compiler/compiler-tests.factor
+++ b/core/alien/compiler/compiler-tests.factor
@@ -1,375 +1,375 @@
-IN: alien.compiler.tests
-USING: alien alien.c-types alien.syntax compiler kernel
-namespaces namespaces tools.test sequences inference words
-arrays parser quotations continuations inference.backend effects
-namespaces.private io io.streams.string memory system threads
-tools.test math ;
-
-FUNCTION: void ffi_test_0 ;
-[ ] [ ffi_test_0 ] unit-test
-
-FUNCTION: int ffi_test_1 ;
-[ 3 ] [ ffi_test_1 ] unit-test
-
-FUNCTION: int ffi_test_2 int x int y ;
-[ 5 ] [ 2 3 ffi_test_2 ] unit-test
-[ "hi" 3 ffi_test_2 ] must-fail
-
-FUNCTION: int ffi_test_3 int x int y int z int t ;
-[ 25 ] [ 2 3 4 5 ffi_test_3 ] unit-test
-
-FUNCTION: float ffi_test_4 ;
-[ 1.5 ] [ ffi_test_4 ] unit-test
-
-FUNCTION: double ffi_test_5 ;
-[ 1.5 ] [ ffi_test_5 ] unit-test
-
-FUNCTION: int ffi_test_9 int a int b int c int d int e int f int g ;
-[ 28 ] [ 1 2 3 4 5 6 7 ffi_test_9 ] unit-test
-[ "a" 2 3 4 5 6 7 ffi_test_9 ] must-fail
-[ 1 2 3 4 5 6 "a" ffi_test_9 ] must-fail
-
-C-STRUCT: foo
-    { "int" "x" }
-    { "int" "y" }
-;
-
-: make-foo ( x y -- foo )
-    "foo" <c-object> [ set-foo-y ] keep [ set-foo-x ] keep ;
-
-FUNCTION: int ffi_test_11 int a foo b int c ;
-
-[ 14 ] [ 1 2 3 make-foo 4 ffi_test_11 ] unit-test
-
-FUNCTION: int ffi_test_13 int a int b int c int d int e int f int g int h int i int j int k ;
-
-[ 66 ] [ 1 2 3 4 5 6 7 8 9 10 11 ffi_test_13 ] unit-test
-
-FUNCTION: foo ffi_test_14 int x int y ;
-
-[ 11 6 ] [ 11 6 ffi_test_14 dup foo-x swap foo-y ] unit-test
-
-FUNCTION: char* ffi_test_15 char* x char* y ;
-
-[ "foo" ] [ "xy" "zt" ffi_test_15 ] unit-test
-[ "bar" ] [ "xy" "xy" ffi_test_15 ] unit-test
-[ 1 2 ffi_test_15 ] must-fail
-
-C-STRUCT: bar
-    { "long" "x" }
-    { "long" "y" }
-    { "long" "z" }
-;
-
-FUNCTION: bar ffi_test_16 long x long y long z ;
-
-[ 11 6 -7 ] [
-    11 6 -7 ffi_test_16 dup bar-x over bar-y rot bar-z
-] unit-test
-
-C-STRUCT: tiny
-    { "int" "x" }
-;
-
-FUNCTION: tiny ffi_test_17 int x ;
-
-[ 11 ] [ 11 ffi_test_17 tiny-x ] unit-test
-
-[ [ alien-indirect ] infer ] [ inference-error? ] must-fail-with
-
-: indirect-test-1
-    "int" { } "cdecl" alien-indirect ;
-
-{ 1 1 } [ indirect-test-1 ] must-infer-as
-
-[ 3 ] [ "ffi_test_1" f dlsym indirect-test-1 ] unit-test
-
-[ -1 indirect-test-1 ] must-fail
-
-: indirect-test-2
-    "int" { "int" "int" } "cdecl" alien-indirect gc ;
-
-{ 3 1 } [ indirect-test-2 ] must-infer-as
-
-[ 5 ]
-[ 2 3 "ffi_test_2" f dlsym indirect-test-2 ]
-unit-test
-
-: indirect-test-3
-    "int" { "int" "int" "int" "int" } "stdcall" alien-indirect
-    gc ;
-
-<< "f-stdcall" f "stdcall" add-library >>
-
-[ f ] [ "f-stdcall" load-library ] unit-test
-[ "stdcall" ] [ "f-stdcall" library library-abi ] unit-test
-
-: ffi_test_18 ( w x y z -- int )
-    "int" "f-stdcall" "ffi_test_18" { "int" "int" "int" "int" }
-    alien-invoke gc ;
-
-[ 25 ] [ 2 3 4 5 ffi_test_18 ] unit-test
-
-: ffi_test_19 ( x y z -- bar )
-    "bar" "f-stdcall" "ffi_test_19" { "long" "long" "long" }
-    alien-invoke gc ;
-
-[ 11 6 -7 ] [
-    11 6 -7 ffi_test_19 dup bar-x over bar-y rot bar-z
-] unit-test
-
-FUNCTION: double ffi_test_6 float x float y ;
-[ 6.0 ] [ 3.0 2.0 ffi_test_6 ] unit-test
-[ "a" "b" ffi_test_6 ] must-fail
-
-FUNCTION: double ffi_test_7 double x double y ;
-[ 6.0 ] [ 3.0 2.0 ffi_test_7 ] unit-test
-
-FUNCTION: double ffi_test_8 double x float y double z float t int w ;
-[ 19.0 ] [ 3.0 2.0 1.0 6.0 7 ffi_test_8 ] unit-test
-
-FUNCTION: int ffi_test_10 int a int b double c int d float e int f int g int h ;
-[ -34 ] [ 1 2 3.0 4 5.0 6 7 8 ffi_test_10 ] unit-test
-
-FUNCTION: void ffi_test_20 double x1, double x2, double x3,
-    double y1, double y2, double y3,
-    double z1, double z2, double z3 ;
-
-[ ] [ 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 ffi_test_20 ] unit-test
-
-! Make sure XT doesn't get clobbered in stack frame
-
-: ffi_test_31
-    "void"
-    f "ffi_test_31"
-    { "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" }
-    alien-invoke gc 3 ;
-
-[ 3 ] [ 42 [ ] each ffi_test_31 ] unit-test
-
-FUNCTION: longlong ffi_test_21 long x long y ;
-
-[ 121932631112635269 ]
-[ 123456789 987654321 ffi_test_21 ] unit-test
-
-FUNCTION: long ffi_test_22 long x longlong y longlong z ;
-
-[ 987655432 ]
-[ 1111 121932631112635269 123456789 ffi_test_22 ] unit-test
-
-[ 1111 f 123456789 ffi_test_22 ] must-fail
-
-C-STRUCT: rect
-    { "float" "x" }
-    { "float" "y" }
-    { "float" "w" }
-    { "float" "h" }
-;
-
-: <rect>
-    "rect" <c-object>
-    [ set-rect-h ] keep
-    [ set-rect-w ] keep
-    [ set-rect-y ] keep
-    [ set-rect-x ] keep ;
-
-FUNCTION: int ffi_test_12 int a int b rect c int d int e int f ;
-
-[ 45 ] [ 1 2 3.0 4.0 5.0 6.0 <rect> 7 8 9 ffi_test_12 ] unit-test
-
-[ 1 2 { 1 2 3 } 7 8 9 ffi_test_12 ] must-fail
-
-FUNCTION: float ffi_test_23 ( float[3] x, float[3] y ) ;
-
-[ 32.0 ] [ { 1.0 2.0 3.0 } >c-float-array { 4.0 5.0 6.0 } >c-float-array ffi_test_23 ] unit-test
-
-! Test odd-size structs
-C-STRUCT: test-struct-1 { { "char" 1 } "x" } ;
-
-FUNCTION: test-struct-1 ffi_test_24 ;
-
-[ B{ 1 } ] [ ffi_test_24 ] unit-test
-
-C-STRUCT: test-struct-2 { { "char" 2 } "x" } ;
-
-FUNCTION: test-struct-2 ffi_test_25 ;
-
-[ B{ 1 2 } ] [ ffi_test_25 ] unit-test
-
-C-STRUCT: test-struct-3 { { "char" 3 } "x" } ;
-
-FUNCTION: test-struct-3 ffi_test_26 ;
-
-[ B{ 1 2 3 } ] [ ffi_test_26 ] unit-test
-
-C-STRUCT: test-struct-4 { { "char" 4 } "x" } ;
-
-FUNCTION: test-struct-4 ffi_test_27 ;
-
-[ B{ 1 2 3 4 } ] [ ffi_test_27 ] unit-test
-
-C-STRUCT: test-struct-5 { { "char" 5 } "x" } ;
-
-FUNCTION: test-struct-5 ffi_test_28 ;
-
-[ B{ 1 2 3 4 5 } ] [ ffi_test_28 ] unit-test
-
-C-STRUCT: test-struct-6 { { "char" 6 } "x" } ;
-
-FUNCTION: test-struct-6 ffi_test_29 ;
-
-[ B{ 1 2 3 4 5 6 } ] [ ffi_test_29 ] unit-test
-
-C-STRUCT: test-struct-7 { { "char" 7 } "x" } ;
-
-FUNCTION: test-struct-7 ffi_test_30 ;
-
-[ B{ 1 2 3 4 5 6 7 } ] [ ffi_test_30 ] unit-test
-
-C-STRUCT: test-struct-8 { "double" "x" } { "double" "y" } ;
-
-FUNCTION: double ffi_test_32 test-struct-8 x int y ;
-
-[ 9.0 ] [
-    "test-struct-8" <c-object>
-    1.0 over set-test-struct-8-x
-    2.0 over set-test-struct-8-y
-    3 ffi_test_32
-] unit-test
-
-C-STRUCT: test-struct-9 { "float" "x" } { "float" "y" } ;
-
-FUNCTION: double ffi_test_33 test-struct-9 x int y ;
-
-[ 9.0 ] [
-    "test-struct-9" <c-object>
-    1.0 over set-test-struct-9-x
-    2.0 over set-test-struct-9-y
-    3 ffi_test_33
-] unit-test
-
-C-STRUCT: test-struct-10 { "float" "x" } { "int" "y" } ;
-
-FUNCTION: double ffi_test_34 test-struct-10 x int y ;
-
-[ 9.0 ] [
-    "test-struct-10" <c-object>
-    1.0 over set-test-struct-10-x
-    2 over set-test-struct-10-y
-    3 ffi_test_34
-] unit-test
-
-C-STRUCT: test-struct-11 { "int" "x" } { "int" "y" } ;
-
-FUNCTION: double ffi_test_35 test-struct-11 x int y ;
-
-[ 9.0 ] [
-    "test-struct-11" <c-object>
-    1 over set-test-struct-11-x
-    2 over set-test-struct-11-y
-    3 ffi_test_35
-] unit-test
-
-C-STRUCT: test-struct-12 { "int" "a" } { "double" "x" } ;
-
-: make-struct-12
-    "test-struct-12" <c-object>
-    [ set-test-struct-12-x ] keep ;
-
-FUNCTION: double ffi_test_36 ( test-struct-12 x ) ;
-
-[ 1.23456 ] [ 1.23456 make-struct-12 ffi_test_36 ] unit-test
-
-FUNCTION: ulonglong ffi_test_38 ( ulonglong x, ulonglong y ) ;
-
-[ t ] [ 31 2^ 32 2^ ffi_test_38 63 2^ = ] unit-test
-
-! Test callbacks
-
-: callback-1 "void" { } "cdecl" [ ] alien-callback ;
-
-[ 0 1 ] [ [ callback-1 ] infer dup effect-in swap effect-out ] unit-test
-
-[ t ] [ callback-1 alien? ] unit-test
-
-: callback_test_1 "void" { } "cdecl" alien-indirect ;
-
-[ ] [ callback-1 callback_test_1 ] unit-test
-
-: callback-2 "void" { } "cdecl" [ [ 5 throw ] ignore-errors ] alien-callback ;
-
-[ ] [ callback-2 callback_test_1 ] unit-test
-
-: callback-3 "void" { } "cdecl" [ 5 "x" set ] alien-callback ;
-
-[ t ] [ 
-    namestack*
-    3 "x" set callback-3 callback_test_1
-    namestack* eq?
-] unit-test
-
-[ 5 ] [ 
-    [
-        3 "x" set callback-3 callback_test_1 "x" get
-    ] with-scope
-] unit-test
-
-: callback-4
-    "void" { } "cdecl" [ "Hello world" write ] alien-callback
-    gc ;
-
-[ "Hello world" ] [ 
-    [ callback-4 callback_test_1 ] with-string-writer
-] unit-test
-
-: callback-5
-    "void" { } "cdecl" [ gc ] alien-callback ;
-
-[ "testing" ] [
-    "testing" callback-5 callback_test_1
-] unit-test
-
-: callback-5a
-    "void" { } "cdecl" [ 8000000 f <array> drop ] alien-callback ;
-
-! Hack; if we're on ARM, we probably don't have much RAM, so
-! skip this test.
-! cpu "arm" = [
-!     [ "testing" ] [
-!         "testing" callback-5a callback_test_1
-!     ] unit-test
-! ] unless
-
-: callback-6
-    "void" { } "cdecl" [ [ continue ] callcc0 ] alien-callback ;
-
-[ 1 2 3 ] [ callback-6 callback_test_1 1 2 3 ] unit-test
-
-: callback-7
-    "void" { } "cdecl" [ 1000 sleep ] alien-callback ;
-
-[ 1 2 3 ] [ callback-7 callback_test_1 1 2 3 ] unit-test
-
-[ f ] [ namespace global eq? ] unit-test
-
-: callback-8
-    "void" { } "cdecl" [
-        [ continue ] callcc0
-    ] alien-callback ;
-
-[ ] [ callback-8 callback_test_1 ] unit-test
-
-: callback-9
-    "int" { "int" "int" "int" } "cdecl" [
-        + + 1+
-    ] alien-callback ;
-
-FUNCTION: void ffi_test_36_point_5 ( ) ;
-
-[ ] [ ffi_test_36_point_5 ] unit-test
-
-FUNCTION: int ffi_test_37 ( void* func ) ;
-
-[ 1 ] [ callback-9 ffi_test_37 ] unit-test
-
-[ 7 ] [ callback-9 ffi_test_37 ] unit-test
+IN: alien.compiler.tests
+USING: alien alien.c-types alien.syntax compiler kernel
+namespaces namespaces tools.test sequences inference words
+arrays parser quotations continuations inference.backend effects
+namespaces.private io io.streams.string memory system threads
+tools.test math ;
+
+FUNCTION: void ffi_test_0 ;
+[ ] [ ffi_test_0 ] unit-test
+
+FUNCTION: int ffi_test_1 ;
+[ 3 ] [ ffi_test_1 ] unit-test
+
+FUNCTION: int ffi_test_2 int x int y ;
+[ 5 ] [ 2 3 ffi_test_2 ] unit-test
+[ "hi" 3 ffi_test_2 ] must-fail
+
+FUNCTION: int ffi_test_3 int x int y int z int t ;
+[ 25 ] [ 2 3 4 5 ffi_test_3 ] unit-test
+
+FUNCTION: float ffi_test_4 ;
+[ 1.5 ] [ ffi_test_4 ] unit-test
+
+FUNCTION: double ffi_test_5 ;
+[ 1.5 ] [ ffi_test_5 ] unit-test
+
+FUNCTION: int ffi_test_9 int a int b int c int d int e int f int g ;
+[ 28 ] [ 1 2 3 4 5 6 7 ffi_test_9 ] unit-test
+[ "a" 2 3 4 5 6 7 ffi_test_9 ] must-fail
+[ 1 2 3 4 5 6 "a" ffi_test_9 ] must-fail
+
+C-STRUCT: foo
+    { "int" "x" }
+    { "int" "y" }
+;
+
+: make-foo ( x y -- foo )
+    "foo" <c-object> [ set-foo-y ] keep [ set-foo-x ] keep ;
+
+FUNCTION: int ffi_test_11 int a foo b int c ;
+
+[ 14 ] [ 1 2 3 make-foo 4 ffi_test_11 ] unit-test
+
+FUNCTION: int ffi_test_13 int a int b int c int d int e int f int g int h int i int j int k ;
+
+[ 66 ] [ 1 2 3 4 5 6 7 8 9 10 11 ffi_test_13 ] unit-test
+
+FUNCTION: foo ffi_test_14 int x int y ;
+
+[ 11 6 ] [ 11 6 ffi_test_14 dup foo-x swap foo-y ] unit-test
+
+FUNCTION: char* ffi_test_15 char* x char* y ;
+
+[ "foo" ] [ "xy" "zt" ffi_test_15 ] unit-test
+[ "bar" ] [ "xy" "xy" ffi_test_15 ] unit-test
+[ 1 2 ffi_test_15 ] must-fail
+
+C-STRUCT: bar
+    { "long" "x" }
+    { "long" "y" }
+    { "long" "z" }
+;
+
+FUNCTION: bar ffi_test_16 long x long y long z ;
+
+[ 11 6 -7 ] [
+    11 6 -7 ffi_test_16 dup bar-x over bar-y rot bar-z
+] unit-test
+
+C-STRUCT: tiny
+    { "int" "x" }
+;
+
+FUNCTION: tiny ffi_test_17 int x ;
+
+[ 11 ] [ 11 ffi_test_17 tiny-x ] unit-test
+
+[ [ alien-indirect ] infer ] [ inference-error? ] must-fail-with
+
+: indirect-test-1
+    "int" { } "cdecl" alien-indirect ;
+
+{ 1 1 } [ indirect-test-1 ] must-infer-as
+
+[ 3 ] [ "ffi_test_1" f dlsym indirect-test-1 ] unit-test
+
+[ -1 indirect-test-1 ] must-fail
+
+: indirect-test-2
+    "int" { "int" "int" } "cdecl" alien-indirect gc ;
+
+{ 3 1 } [ indirect-test-2 ] must-infer-as
+
+[ 5 ]
+[ 2 3 "ffi_test_2" f dlsym indirect-test-2 ]
+unit-test
+
+: indirect-test-3
+    "int" { "int" "int" "int" "int" } "stdcall" alien-indirect
+    gc ;
+
+<< "f-stdcall" f "stdcall" add-library >>
+
+[ f ] [ "f-stdcall" load-library ] unit-test
+[ "stdcall" ] [ "f-stdcall" library library-abi ] unit-test
+
+: ffi_test_18 ( w x y z -- int )
+    "int" "f-stdcall" "ffi_test_18" { "int" "int" "int" "int" }
+    alien-invoke gc ;
+
+[ 25 ] [ 2 3 4 5 ffi_test_18 ] unit-test
+
+: ffi_test_19 ( x y z -- bar )
+    "bar" "f-stdcall" "ffi_test_19" { "long" "long" "long" }
+    alien-invoke gc ;
+
+[ 11 6 -7 ] [
+    11 6 -7 ffi_test_19 dup bar-x over bar-y rot bar-z
+] unit-test
+
+FUNCTION: double ffi_test_6 float x float y ;
+[ 6.0 ] [ 3.0 2.0 ffi_test_6 ] unit-test
+[ "a" "b" ffi_test_6 ] must-fail
+
+FUNCTION: double ffi_test_7 double x double y ;
+[ 6.0 ] [ 3.0 2.0 ffi_test_7 ] unit-test
+
+FUNCTION: double ffi_test_8 double x float y double z float t int w ;
+[ 19.0 ] [ 3.0 2.0 1.0 6.0 7 ffi_test_8 ] unit-test
+
+FUNCTION: int ffi_test_10 int a int b double c int d float e int f int g int h ;
+[ -34 ] [ 1 2 3.0 4 5.0 6 7 8 ffi_test_10 ] unit-test
+
+FUNCTION: void ffi_test_20 double x1, double x2, double x3,
+    double y1, double y2, double y3,
+    double z1, double z2, double z3 ;
+
+[ ] [ 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 ffi_test_20 ] unit-test
+
+! Make sure XT doesn't get clobbered in stack frame
+
+: ffi_test_31
+    "void"
+    f "ffi_test_31"
+    { "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" "int" }
+    alien-invoke gc 3 ;
+
+[ 3 ] [ 42 [ ] each ffi_test_31 ] unit-test
+
+FUNCTION: longlong ffi_test_21 long x long y ;
+
+[ 121932631112635269 ]
+[ 123456789 987654321 ffi_test_21 ] unit-test
+
+FUNCTION: long ffi_test_22 long x longlong y longlong z ;
+
+[ 987655432 ]
+[ 1111 121932631112635269 123456789 ffi_test_22 ] unit-test
+
+[ 1111 f 123456789 ffi_test_22 ] must-fail
+
+C-STRUCT: rect
+    { "float" "x" }
+    { "float" "y" }
+    { "float" "w" }
+    { "float" "h" }
+;
+
+: <rect>
+    "rect" <c-object>
+    [ set-rect-h ] keep
+    [ set-rect-w ] keep
+    [ set-rect-y ] keep
+    [ set-rect-x ] keep ;
+
+FUNCTION: int ffi_test_12 int a int b rect c int d int e int f ;
+
+[ 45 ] [ 1 2 3.0 4.0 5.0 6.0 <rect> 7 8 9 ffi_test_12 ] unit-test
+
+[ 1 2 { 1 2 3 } 7 8 9 ffi_test_12 ] must-fail
+
+FUNCTION: float ffi_test_23 ( float[3] x, float[3] y ) ;
+
+[ 32.0 ] [ { 1.0 2.0 3.0 } >c-float-array { 4.0 5.0 6.0 } >c-float-array ffi_test_23 ] unit-test
+
+! Test odd-size structs
+C-STRUCT: test-struct-1 { { "char" 1 } "x" } ;
+
+FUNCTION: test-struct-1 ffi_test_24 ;
+
+[ B{ 1 } ] [ ffi_test_24 ] unit-test
+
+C-STRUCT: test-struct-2 { { "char" 2 } "x" } ;
+
+FUNCTION: test-struct-2 ffi_test_25 ;
+
+[ B{ 1 2 } ] [ ffi_test_25 ] unit-test
+
+C-STRUCT: test-struct-3 { { "char" 3 } "x" } ;
+
+FUNCTION: test-struct-3 ffi_test_26 ;
+
+[ B{ 1 2 3 } ] [ ffi_test_26 ] unit-test
+
+C-STRUCT: test-struct-4 { { "char" 4 } "x" } ;
+
+FUNCTION: test-struct-4 ffi_test_27 ;
+
+[ B{ 1 2 3 4 } ] [ ffi_test_27 ] unit-test
+
+C-STRUCT: test-struct-5 { { "char" 5 } "x" } ;
+
+FUNCTION: test-struct-5 ffi_test_28 ;
+
+[ B{ 1 2 3 4 5 } ] [ ffi_test_28 ] unit-test
+
+C-STRUCT: test-struct-6 { { "char" 6 } "x" } ;
+
+FUNCTION: test-struct-6 ffi_test_29 ;
+
+[ B{ 1 2 3 4 5 6 } ] [ ffi_test_29 ] unit-test
+
+C-STRUCT: test-struct-7 { { "char" 7 } "x" } ;
+
+FUNCTION: test-struct-7 ffi_test_30 ;
+
+[ B{ 1 2 3 4 5 6 7 } ] [ ffi_test_30 ] unit-test
+
+C-STRUCT: test-struct-8 { "double" "x" } { "double" "y" } ;
+
+FUNCTION: double ffi_test_32 test-struct-8 x int y ;
+
+[ 9.0 ] [
+    "test-struct-8" <c-object>
+    1.0 over set-test-struct-8-x
+    2.0 over set-test-struct-8-y
+    3 ffi_test_32
+] unit-test
+
+C-STRUCT: test-struct-9 { "float" "x" } { "float" "y" } ;
+
+FUNCTION: double ffi_test_33 test-struct-9 x int y ;
+
+[ 9.0 ] [
+    "test-struct-9" <c-object>
+    1.0 over set-test-struct-9-x
+    2.0 over set-test-struct-9-y
+    3 ffi_test_33
+] unit-test
+
+C-STRUCT: test-struct-10 { "float" "x" } { "int" "y" } ;
+
+FUNCTION: double ffi_test_34 test-struct-10 x int y ;
+
+[ 9.0 ] [
+    "test-struct-10" <c-object>
+    1.0 over set-test-struct-10-x
+    2 over set-test-struct-10-y
+    3 ffi_test_34
+] unit-test
+
+C-STRUCT: test-struct-11 { "int" "x" } { "int" "y" } ;
+
+FUNCTION: double ffi_test_35 test-struct-11 x int y ;
+
+[ 9.0 ] [
+    "test-struct-11" <c-object>
+    1 over set-test-struct-11-x
+    2 over set-test-struct-11-y
+    3 ffi_test_35
+] unit-test
+
+C-STRUCT: test-struct-12 { "int" "a" } { "double" "x" } ;
+
+: make-struct-12
+    "test-struct-12" <c-object>
+    [ set-test-struct-12-x ] keep ;
+
+FUNCTION: double ffi_test_36 ( test-struct-12 x ) ;
+
+[ 1.23456 ] [ 1.23456 make-struct-12 ffi_test_36 ] unit-test
+
+FUNCTION: ulonglong ffi_test_38 ( ulonglong x, ulonglong y ) ;
+
+[ t ] [ 31 2^ 32 2^ ffi_test_38 63 2^ = ] unit-test
+
+! Test callbacks
+
+: callback-1 "void" { } "cdecl" [ ] alien-callback ;
+
+[ 0 1 ] [ [ callback-1 ] infer dup effect-in swap effect-out ] unit-test
+
+[ t ] [ callback-1 alien? ] unit-test
+
+: callback_test_1 "void" { } "cdecl" alien-indirect ;
+
+[ ] [ callback-1 callback_test_1 ] unit-test
+
+: callback-2 "void" { } "cdecl" [ [ 5 throw ] ignore-errors ] alien-callback ;
+
+[ ] [ callback-2 callback_test_1 ] unit-test
+
+: callback-3 "void" { } "cdecl" [ 5 "x" set ] alien-callback ;
+
+[ t ] [
+    namestack*
+    3 "x" set callback-3 callback_test_1
+    namestack* eq?
+] unit-test
+
+[ 5 ] [
+    [
+        3 "x" set callback-3 callback_test_1 "x" get
+    ] with-scope
+] unit-test
+
+: callback-4
+    "void" { } "cdecl" [ "Hello world" write ] alien-callback
+    gc ;
+
+[ "Hello world" ] [
+    [ callback-4 callback_test_1 ] with-string-writer
+] unit-test
+
+: callback-5
+    "void" { } "cdecl" [ gc ] alien-callback ;
+
+[ "testing" ] [
+    "testing" callback-5 callback_test_1
+] unit-test
+
+: callback-5a
+    "void" { } "cdecl" [ 8000000 f <array> drop ] alien-callback ;
+
+! Hack; if we're on ARM, we probably don't have much RAM, so
+! skip this test.
+! cpu "arm" = [
+!     [ "testing" ] [
+!         "testing" callback-5a callback_test_1
+!     ] unit-test
+! ] unless
+
+: callback-6
+    "void" { } "cdecl" [ [ continue ] callcc0 ] alien-callback ;
+
+[ 1 2 3 ] [ callback-6 callback_test_1 1 2 3 ] unit-test
+
+: callback-7
+    "void" { } "cdecl" [ 1000 sleep ] alien-callback ;
+
+[ 1 2 3 ] [ callback-7 callback_test_1 1 2 3 ] unit-test
+
+[ f ] [ namespace global eq? ] unit-test
+
+: callback-8
+    "void" { } "cdecl" [
+        [ continue ] callcc0
+    ] alien-callback ;
+
+[ ] [ callback-8 callback_test_1 ] unit-test
+
+: callback-9
+    "int" { "int" "int" "int" } "cdecl" [
+        + + 1+
+    ] alien-callback ;
+
+FUNCTION: void int_ffi_test_36_point_5 ( ) ;
+
+[ ] [ int_ffi_test_36_point_5 ] unit-test
+
+FUNCTION: int ffi_test_37 ( void* func ) ;
+
+[ 1 ] [ callback-9 ffi_test_37 ] unit-test
+
+[ 7 ] [ callback-9 ffi_test_37 ] unit-test
diff --git a/vm/ffi_test.c b/vm/ffi_test.c
index b2cbf9b6b5..4293a6bbae 100755
--- a/vm/ffi_test.c
+++ b/vm/ffi_test.c
@@ -253,7 +253,7 @@ double ffi_test_36(struct test_struct_12 x)
 
 static int global_var;
 
-void ffi_test_36_point_5(void)
+void int_ffi_test_36_point_5(void)
 {
 	printf("int_ffi_test_36_point_5\n");
 	global_var = 0;