diff --git a/basis/locals/locals-tests.factor b/basis/locals/locals-tests.factor
index 0a9ae2d863..355b7fa054 100644
--- a/basis/locals/locals-tests.factor
+++ b/basis/locals/locals-tests.factor
@@ -361,7 +361,7 @@ ERROR: punned-class x ;
 { 4 } [ 12 littledan-cond-problem-1 ] unit-test
 { "howdy" } [ 0 littledan-cond-problem-1 ] unit-test
 
-/*
+![[
 :: littledan-case-problem-3 ( a quot -- b )
     a {
         { t [ a not ] }
@@ -377,7 +377,7 @@ ERROR: punned-class x ;
     [ 1 + ] littledan-case-problem-3 ;
 
 \ littledan-case-problem-4 def>> must-infer
-*/
+]]
 
 GENERIC: lambda-method-forget-test ( a -- b )
 
diff --git a/core/parser/parser-tests.factor b/core/parser/parser-tests.factor
index 3bd648647b..9c4d3d3f5e 100644
--- a/core/parser/parser-tests.factor
+++ b/core/parser/parser-tests.factor
@@ -1,6 +1,6 @@
 USING: accessors arrays assocs classes compiler.units effects
 eval generic grouping io.pathnames io.streams.string kernel
-lexer math multiline namespaces parser sequences sets
+lexer math namespaces parser sequences sets
 source-files source-files.errors strings tools.crossref
 tools.test vocabs vocabs.parser words words.symbol ;
 IN: parser.tests
@@ -540,7 +540,7 @@ EXCLUDE: qualified.tests.bar => x ;
 ! Two similar bugs
 
 ! Replace : def with something in << >>
-/* { [ ] } [
+![[ { [ ] } [
     "IN: parser.tests : was-once-a-word-bug ( -- ) ;"
     <string-reader> "was-once-a-word-test" parse-stream
 ] unit-test
@@ -552,7 +552,7 @@ EXCLUDE: qualified.tests.bar => x ;
     <string-reader> "was-once-a-word-test" parse-stream
 ] unit-test
 
-{ t } [ "was-once-a-word-bug" "parser.tests" lookup-word >boolean ] unit-test */
+{ t } [ "was-once-a-word-bug" "parser.tests" lookup-word >boolean ] unit-test ]]
 
 ! Replace : def with DEFER:
 { [ ] } [
diff --git a/extra/bloom-filters/bloom-filters.factor b/extra/bloom-filters/bloom-filters.factor
index 07ff68703a..ceecf480b4 100644
--- a/extra/bloom-filters/bloom-filters.factor
+++ b/extra/bloom-filters/bloom-filters.factor
@@ -7,7 +7,7 @@ FROM: math.ranges => [1,b] ;
 
 IN: bloom-filters
 
-/*
+![[
 
 TODO:
 
@@ -41,7 +41,7 @@ TODO:
   objects the filter is sized for?  The filter will continue to
   work, just not very well.
 
-*/
+]]
 
 TUPLE: bloom-filter
 { #hashes fixnum read-only }
diff --git a/extra/c/preprocessor/preprocessor-tests.factor b/extra/c/preprocessor/preprocessor-tests.factor
index f0ac37258a..30bd4701e5 100644
--- a/extra/c/preprocessor/preprocessor-tests.factor
+++ b/extra/c/preprocessor/preprocessor-tests.factor
@@ -9,10 +9,10 @@ IN: c.preprocessor.tests
 { "yo\n\n\n\nyo4\n" }
 [ "vocab:c/tests/test2/test2.c" start-preprocess-file nip ] unit-test
 
-/*
+![[
 [ "vocab:c/tests/test3/test3.c" start-preprocess-file ]
 [ "\"BOO\"" = ] must-fail-with
-*/
+]]
 
 { V{ "\"omg\"" "\"lol\"" } }
 [ "vocab:c/tests/test4/test4.c" start-preprocess-file drop warnings>> ] unit-test
diff --git a/extra/curses/curses.factor b/extra/curses/curses.factor
index 24e49ba4b4..a370ae4743 100644
--- a/extra/curses/curses.factor
+++ b/extra/curses/curses.factor
@@ -41,102 +41,102 @@ CONSTANT: A_RIGHT       268435456
 CONSTANT: A_TOP         536870912
 CONSTANT: A_VERTICAL    1073741824
 
-CONSTANT: KEY_CODE_YES  0o400  /* A wchar_t contains a key code */
-CONSTANT: KEY_MIN       0o401  /* Minimum curses key */
-CONSTANT: KEY_BREAK     0o401  /* Break key (unreliable) */
-CONSTANT: KEY_SRESET    0o530  /* Soft (partial) reset (unreliable) */
-CONSTANT: KEY_RESET     0o531  /* Reset or hard reset (unreliable) */
-CONSTANT: KEY_DOWN      0o402  /* down-arrow key */
-CONSTANT: KEY_UP        0o403  /* up-arrow key */
-CONSTANT: KEY_LEFT      0o404  /* left-arrow key */
-CONSTANT: KEY_RIGHT     0o405  /* right-arrow key */
-CONSTANT: KEY_HOME      0o406  /* home key */
-CONSTANT: KEY_BACKSPACE 0o407  /* backspace key */
-CONSTANT: KEY_DL        0o510  /* delete-line key */
-CONSTANT: KEY_IL        0o511  /* insert-line key */
-CONSTANT: KEY_DC        0o512  /* delete-character key */
-CONSTANT: KEY_IC        0o513  /* insert-character key */
-CONSTANT: KEY_EIC       0o514  /* sent by rmir or smir in insert mode */
-CONSTANT: KEY_CLEAR     0o515  /* clear-screen or erase key */
-CONSTANT: KEY_EOS       0o516  /* clear-to-end-of-screen key */
-CONSTANT: KEY_EOL       0o517  /* clear-to-end-of-line key */
-CONSTANT: KEY_SF        0o520  /* scroll-forward key */
-CONSTANT: KEY_SR        0o521  /* scroll-backward key */
-CONSTANT: KEY_NPAGE     0o522  /* next-page key */
-CONSTANT: KEY_PPAGE     0o523  /* previous-page key */
-CONSTANT: KEY_STAB      0o524  /* set-tab key */
-CONSTANT: KEY_CTAB      0o525  /* clear-tab key */
-CONSTANT: KEY_CATAB     0o526  /* clear-all-tabs key */
-CONSTANT: KEY_ENTER     0o527  /* enter/send key */
-CONSTANT: KEY_PRINT     0o532  /* print key */
-CONSTANT: KEY_LL        0o533  /* lower-left key (home down) */
-CONSTANT: KEY_A1        0o534  /* upper left of keypad */
-CONSTANT: KEY_A3        0o535  /* upper right of keypad */
-CONSTANT: KEY_B2        0o536  /* center of keypad */
-CONSTANT: KEY_C1        0o537  /* lower left of keypad */
-CONSTANT: KEY_C3        0o540  /* lower right of keypad */
-CONSTANT: KEY_BTAB      0o541  /* back-tab key */
-CONSTANT: KEY_BEG       0o542  /* begin key */
-CONSTANT: KEY_CANCEL    0o543  /* cancel key */
-CONSTANT: KEY_CLOSE     0o544  /* close key */
-CONSTANT: KEY_COMMAND   0o545  /* command key */
-CONSTANT: KEY_COPY      0o546  /* copy key */
-CONSTANT: KEY_CREATE    0o547  /* create key */
-CONSTANT: KEY_END       0o550  /* end key */
-CONSTANT: KEY_EXIT      0o551  /* exit key */
-CONSTANT: KEY_FIND      0o552  /* find key */
-CONSTANT: KEY_HELP      0o553  /* help key */
-CONSTANT: KEY_MARK      0o554  /* mark key */
-CONSTANT: KEY_MESSAGE   0o555  /* message key */
-CONSTANT: KEY_MOVE      0o556  /* move key */
-CONSTANT: KEY_NEXT      0o557  /* next key */
-CONSTANT: KEY_OPEN      0o560  /* open key */
-CONSTANT: KEY_OPTIONS   0o561  /* options key */
-CONSTANT: KEY_PREVIOUS  0o562  /* previous key */
-CONSTANT: KEY_REDO      0o563  /* redo key */
-CONSTANT: KEY_REFERENCE 0o564  /* reference key */
-CONSTANT: KEY_REFRESH   0o565  /* refresh key */
-CONSTANT: KEY_REPLACE   0o566  /* replace key */
-CONSTANT: KEY_RESTART   0o567  /* restart key */
-CONSTANT: KEY_RESUME    0o570  /* resume key */
-CONSTANT: KEY_SAVE      0o571  /* save key */
-CONSTANT: KEY_SBEG      0o572  /* shifted begin key */
-CONSTANT: KEY_SCANCEL   0o573  /* shifted cancel key */
-CONSTANT: KEY_SCOMMAND  0o574  /* shifted command key */
-CONSTANT: KEY_SCOPY     0o575  /* shifted copy key */
-CONSTANT: KEY_SCREATE   0o576  /* shifted create key */
-CONSTANT: KEY_SDC       0o577  /* shifted delete-character key */
-CONSTANT: KEY_SDL       0o600  /* shifted delete-line key */
-CONSTANT: KEY_SELECT    0o601  /* select key */
-CONSTANT: KEY_SEND      0o602  /* shifted end key */
-CONSTANT: KEY_SEOL      0o603  /* shifted clear-to-end-of-line key */
-CONSTANT: KEY_SEXIT     0o604  /* shifted exit key */
-CONSTANT: KEY_SFIND     0o605  /* shifted find key */
-CONSTANT: KEY_SHELP     0o606  /* shifted help key */
-CONSTANT: KEY_SHOME     0o607  /* shifted home key */
-CONSTANT: KEY_SIC       0o610  /* shifted insert-character key */
-CONSTANT: KEY_SLEFT     0o611  /* shifted left-arrow key */
-CONSTANT: KEY_SMESSAGE  0o612  /* shifted message key */
-CONSTANT: KEY_SMOVE     0o613  /* shifted move key */
-CONSTANT: KEY_SNEXT     0o614  /* shifted next key */
-CONSTANT: KEY_SOPTIONS  0o615  /* shifted options key */
-CONSTANT: KEY_SPREVIOUS 0o616  /* shifted previous key */
-CONSTANT: KEY_SPRINT    0o617  /* shifted print key */
-CONSTANT: KEY_SREDO     0o620  /* shifted redo key */
-CONSTANT: KEY_SREPLACE  0o621  /* shifted replace key */
-CONSTANT: KEY_SRIGHT    0o622  /* shifted right-arrow key */
-CONSTANT: KEY_SRSUME    0o623  /* shifted resume key */
-CONSTANT: KEY_SSAVE     0o624  /* shifted save key */
-CONSTANT: KEY_SSUSPEND  0o625  /* shifted suspend key */
-CONSTANT: KEY_SUNDO     0o626  /* shifted undo key */
-CONSTANT: KEY_SUSPEND   0o627  /* suspend key */
-CONSTANT: KEY_UNDO      0o630  /* undo key */
-CONSTANT: KEY_MOUSE     0o631  /* Mouse event has occurred */
-CONSTANT: KEY_RESIZE    0o632  /* Terminal resize event */
-CONSTANT: KEY_EVENT     0o633  /* We were interrupted by an event */
-CONSTANT: KEY_MAX       0o777  /* Maximum key value is 0633 */
-CONSTANT: KEY_F0        0o410  /* Function keys.  Space for 64 */
-: KEY_F ( n -- code ) KEY_F0 + ; inline /* Value of function key n */
+CONSTANT: KEY_CODE_YES  0o400  ! A wchar_t contains a key code
+CONSTANT: KEY_MIN       0o401  ! Minimum curses key
+CONSTANT: KEY_BREAK     0o401  ! Break key (unreliable)
+CONSTANT: KEY_SRESET    0o530  ! Soft (partial) reset (unreliable)
+CONSTANT: KEY_RESET     0o531  ! Reset or hard reset (unreliable)
+CONSTANT: KEY_DOWN      0o402  ! down-arrow key
+CONSTANT: KEY_UP        0o403  ! up-arrow key
+CONSTANT: KEY_LEFT      0o404  ! left-arrow key
+CONSTANT: KEY_RIGHT     0o405  ! right-arrow key
+CONSTANT: KEY_HOME      0o406  ! home key
+CONSTANT: KEY_BACKSPACE 0o407  ! backspace key
+CONSTANT: KEY_DL        0o510  ! delete-line key
+CONSTANT: KEY_IL        0o511  ! insert-line key
+CONSTANT: KEY_DC        0o512  ! delete-character key
+CONSTANT: KEY_IC        0o513  ! insert-character key
+CONSTANT: KEY_EIC       0o514  ! sent by rmir or smir in insert mode
+CONSTANT: KEY_CLEAR     0o515  ! clear-screen or erase key
+CONSTANT: KEY_EOS       0o516  ! clear-to-end-of-screen key
+CONSTANT: KEY_EOL       0o517  ! clear-to-end-of-line key
+CONSTANT: KEY_SF        0o520  ! scroll-forward key
+CONSTANT: KEY_SR        0o521  ! scroll-backward key
+CONSTANT: KEY_NPAGE     0o522  ! next-page key
+CONSTANT: KEY_PPAGE     0o523  ! previous-page key
+CONSTANT: KEY_STAB      0o524  ! set-tab key
+CONSTANT: KEY_CTAB      0o525  ! clear-tab key
+CONSTANT: KEY_CATAB     0o526  ! clear-all-tabs key
+CONSTANT: KEY_ENTER     0o527  ! enter/send key
+CONSTANT: KEY_PRINT     0o532  ! print key
+CONSTANT: KEY_LL        0o533  ! lower-left key (home down)
+CONSTANT: KEY_A1        0o534  ! upper left of keypad
+CONSTANT: KEY_A3        0o535  ! upper right of keypad
+CONSTANT: KEY_B2        0o536  ! center of keypad
+CONSTANT: KEY_C1        0o537  ! lower left of keypad
+CONSTANT: KEY_C3        0o540  ! lower right of keypad
+CONSTANT: KEY_BTAB      0o541  ! back-tab key
+CONSTANT: KEY_BEG       0o542  ! begin key
+CONSTANT: KEY_CANCEL    0o543  ! cancel key
+CONSTANT: KEY_CLOSE     0o544  ! close key
+CONSTANT: KEY_COMMAND   0o545  ! command key
+CONSTANT: KEY_COPY      0o546  ! copy key
+CONSTANT: KEY_CREATE    0o547  ! create key
+CONSTANT: KEY_END       0o550  ! end key
+CONSTANT: KEY_EXIT      0o551  ! exit key
+CONSTANT: KEY_FIND      0o552  ! find key
+CONSTANT: KEY_HELP      0o553  ! help key
+CONSTANT: KEY_MARK      0o554  ! mark key
+CONSTANT: KEY_MESSAGE   0o555  ! message key
+CONSTANT: KEY_MOVE      0o556  ! move key
+CONSTANT: KEY_NEXT      0o557  ! next key
+CONSTANT: KEY_OPEN      0o560  ! open key
+CONSTANT: KEY_OPTIONS   0o561  ! options key
+CONSTANT: KEY_PREVIOUS  0o562  ! previous key
+CONSTANT: KEY_REDO      0o563  ! redo key
+CONSTANT: KEY_REFERENCE 0o564  ! reference key
+CONSTANT: KEY_REFRESH   0o565  ! refresh key
+CONSTANT: KEY_REPLACE   0o566  ! replace key
+CONSTANT: KEY_RESTART   0o567  ! restart key
+CONSTANT: KEY_RESUME    0o570  ! resume key
+CONSTANT: KEY_SAVE      0o571  ! save key
+CONSTANT: KEY_SBEG      0o572  ! shifted begin key
+CONSTANT: KEY_SCANCEL   0o573  ! shifted cancel key
+CONSTANT: KEY_SCOMMAND  0o574  ! shifted command key
+CONSTANT: KEY_SCOPY     0o575  ! shifted copy key
+CONSTANT: KEY_SCREATE   0o576  ! shifted create key
+CONSTANT: KEY_SDC       0o577  ! shifted delete-character key
+CONSTANT: KEY_SDL       0o600  ! shifted delete-line key
+CONSTANT: KEY_SELECT    0o601  ! select key
+CONSTANT: KEY_SEND      0o602  ! shifted end key
+CONSTANT: KEY_SEOL      0o603  ! shifted clear-to-end-of-line key
+CONSTANT: KEY_SEXIT     0o604  ! shifted exit key
+CONSTANT: KEY_SFIND     0o605  ! shifted find key
+CONSTANT: KEY_SHELP     0o606  ! shifted help key
+CONSTANT: KEY_SHOME     0o607  ! shifted home key
+CONSTANT: KEY_SIC       0o610  ! shifted insert-character key
+CONSTANT: KEY_SLEFT     0o611  ! shifted left-arrow key
+CONSTANT: KEY_SMESSAGE  0o612  ! shifted message key
+CONSTANT: KEY_SMOVE     0o613  ! shifted move key
+CONSTANT: KEY_SNEXT     0o614  ! shifted next key
+CONSTANT: KEY_SOPTIONS  0o615  ! shifted options key
+CONSTANT: KEY_SPREVIOUS 0o616  ! shifted previous key
+CONSTANT: KEY_SPRINT    0o617  ! shifted print key
+CONSTANT: KEY_SREDO     0o620  ! shifted redo key
+CONSTANT: KEY_SREPLACE  0o621  ! shifted replace key
+CONSTANT: KEY_SRIGHT    0o622  ! shifted right-arrow key
+CONSTANT: KEY_SRSUME    0o623  ! shifted resume key
+CONSTANT: KEY_SSAVE     0o624  ! shifted save key
+CONSTANT: KEY_SSUSPEND  0o625  ! shifted suspend key
+CONSTANT: KEY_SUNDO     0o626  ! shifted undo key
+CONSTANT: KEY_SUSPEND   0o627  ! suspend key
+CONSTANT: KEY_UNDO      0o630  ! undo key
+CONSTANT: KEY_MOUSE     0o631  ! Mouse event has occurred
+CONSTANT: KEY_RESIZE    0o632  ! Terminal resize event
+CONSTANT: KEY_EVENT     0o633  ! We were interrupted by an event
+CONSTANT: KEY_MAX       0o777  ! Maximum key value is 0633
+CONSTANT: KEY_F0        0o410  ! Function keys.  Space for 64
+: KEY_F ( n -- code ) KEY_F0 + ; inline ! Value of function key n
 
 : BUTTON1_RELEASED       ( -- mask ) 1 ffi:NCURSES_BUTTON_RELEASED ffi:NCURSES_MOUSE_MASK ; inline
 : BUTTON1_PRESSED        ( -- mask ) 1 ffi:NCURSES_BUTTON_PRESSED  ffi:NCURSES_MOUSE_MASK ; inline
diff --git a/extra/dice/dice.factor b/extra/dice/dice.factor
index 83ff709459..56d9086d6d 100644
--- a/extra/dice/dice.factor
+++ b/extra/dice/dice.factor
@@ -26,4 +26,4 @@ IN: dice
         '[ _ _ random-roll ]
     ] if* ;
 
-SYNTAX: \ROLL: scan-token roll-quot append! ;
+SYNTAX: \roll: scan-token roll-quot append! ;
diff --git a/extra/gpu/effects/blur/blur.factor b/extra/gpu/effects/blur/blur.factor
index 5e1094a8c5..bd38d235cd 100644
--- a/extra/gpu/effects/blur/blur.factor
+++ b/extra/gpu/effects/blur/blur.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2010 Erik Charlebois.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays destructors fry gpu.framebuffers gpu.render gpu.shaders
-gpu.state gpu.textures gpu.util images kernel locals math
-math.rectangles sequences ;
+USING: destructors fry gpu.render gpu.shaders gpu.state
+gpu.textures gpu.util images kernel locals math math.rectangles
+multiline sequences ;
 IN: gpu.effects.blur
 
 GLSL-SHADER: blur-fragment-shader fragment-shader [[
diff --git a/extra/gpu/effects/step/step.factor b/extra/gpu/effects/step/step.factor
index aad550ba80..bbf0f90d7b 100644
--- a/extra/gpu/effects/step/step.factor
+++ b/extra/gpu/effects/step/step.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Erik Charlebois.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: destructors gpu.render gpu.shaders gpu.state gpu.textures
-gpu.util images kernel locals math.rectangles ;
+USING: destructors gpu.render gpu.shaders gpu.state gpu.util
+images kernel locals math.rectangles multiline ;
 IN: gpu.effects.step
 
 GLSL-SHADER: step-fragment-shader fragment-shader [[
diff --git a/extra/model-viewer/model-viewer.factor b/extra/model-viewer/model-viewer.factor
index ab2b5cfca5..4d3db89482 100644
--- a/extra/model-viewer/model-viewer.factor
+++ b/extra/model-viewer/model-viewer.factor
@@ -10,7 +10,7 @@ method-chains namespaces sequences splitting threads ui ui.gadgets
 ui.gadgets.worlds ui.pixel-formats specialized-arrays
 specialized-vectors fry sequences.deep destructors math.bitwise opengl.gl
 game.models game.models.obj game.models.loader game.models.collada
-prettyprint images.tga literals ;
+prettyprint images.tga literals multiline ;
 FROM: alien.c-types => float ;
 SPECIALIZED-ARRAY: float
 SPECIALIZED-VECTOR: uint
diff --git a/extra/mongodb/msg/msg.factor b/extra/mongodb/msg/msg.factor
index ed29dd8827..14f188be65 100644
--- a/extra/mongodb/msg/msg.factor
+++ b/extra/mongodb/msg/msg.factor
@@ -12,9 +12,9 @@ CONSTANT: OP_GetMore 2005
 CONSTANT: OP_Delete  2006
 CONSTANT: OP_KillCursors 2007
 
-CONSTANT: ResultFlag_CursorNotFound  1 ! /* returned, with zero results, when getMore is called but the cursor id is not valid at the server. */
-CONSTANT: ResultFlag_ErrSet  2 ! /* { $err : ... } is being returned */
-CONSTANT: ResultFlag_ShardConfigStale 4 !  /* have to update config from the server,  usually $err is also set */
+CONSTANT: ResultFlag_CursorNotFound  1 ! returned, with zero results, when getMore is called but the cursor id is not valid at the server.
+CONSTANT: ResultFlag_ErrSet  2 ! { $err : ... } is being returned
+CONSTANT: ResultFlag_ShardConfigStale 4 !  have to update config from the server,  usually $err is also set
 
 TUPLE: mdb-msg
     { opcode integer }