diff --git a/extra/boids/boids.factor b/extra/boids/boids.factor
index 7991ad119a..58ca77ba8c 100644
--- a/extra/boids/boids.factor
+++ b/extra/boids/boids.factor
@@ -6,7 +6,8 @@ literals locals math math.functions math.trig models opengl
 opengl.demo-support opengl.gl sequences threads ui ui.gadgets
 ui.gadgets.borders ui.gadgets.buttons ui.gadgets.frames
 ui.gadgets.grids ui.gadgets.labeled ui.gadgets.labels
-ui.gadgets.packs ui.gadgets.sliders ui.render ;
+ui.gadgets.packs ui.gadgets.sliders ui.render
+combinators.smart.syntax ;
 QUALIFIED-WITH: models.range mr
 IN: boids
 
diff --git a/extra/compiler/cfg/gvn/testing/testing.factor b/extra/compiler/cfg/gvn/testing/testing.factor
index 73e7fe060a..166f900466 100644
--- a/extra/compiler/cfg/gvn/testing/testing.factor
+++ b/extra/compiler/cfg/gvn/testing/testing.factor
@@ -47,12 +47,12 @@ M: object expr>str unparse ;
     basic-block get number>> ;
 
 : add-gvns ( graph -- graph' )
-    "gvns" [add-node
+    "gvns" add-node[
         congruence-classes =label
         "plaintext" =shape
-    ];
-    "gvns" 0 [add-edge "invis" =style ];
-    basic-block# [add-node "bold" =style ];
+    ]
+    "gvns" 0 add-edge[ "invis" =style ]
+    basic-block# add-node[ "bold" =style ]
     ;
 
 SYMBOL: iteration
diff --git a/extra/game/debug/debug.factor b/extra/game/debug/debug.factor
index 9e7691bf78..06ba1e68c6 100644
--- a/extra/game/debug/debug.factor
+++ b/extra/game/debug/debug.factor
@@ -4,7 +4,8 @@ USING: accessors alien.c-types alien.data arrays circular colors
 colors.constants columns destructors fonts gpu.buffers
 gpu.render gpu.shaders gpu.state gpu.textures images kernel
 literals locals make math math.constants math.functions
-math.vectors sequences specialized-arrays typed ui.text fry ;
+math.vectors sequences specialized-arrays typed ui.text fry
+multiline ;
 FROM: alien.c-types => float ;
 SPECIALIZED-ARRAYS: float uint ;
 IN: game.debug
diff --git a/extra/rosetta-code/pythagorean-triples/pythagorean-triples.factor b/extra/rosetta-code/pythagorean-triples/pythagorean-triples.factor
index d47065dc41..0a52d57d59 100644
--- a/extra/rosetta-code/pythagorean-triples/pythagorean-triples.factor
+++ b/extra/rosetta-code/pythagorean-triples/pythagorean-triples.factor
@@ -1,7 +1,8 @@
 ! Copyright (c) 2012 Anonymous
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays formatting kernel literals math
-math.functions math.matrices math.ranges sequences ;
+USING: accessors arrays combinators.smart.syntax formatting
+kernel literals math math.functions math.matrices math.ranges
+sequences ;
 IN: rosetta-code.pythagorean-triples
 
 ! http://rosettacode.org/wiki/Pythagorean_triples
diff --git a/extra/slides/slides.factor b/extra/slides/slides.factor
index bb3ebd93cc..358e30c213 100644
--- a/extra/slides/slides.factor
+++ b/extra/slides/slides.factor
@@ -3,7 +3,7 @@
 USING: accessors arrays colors fonts fry help.markup help.stylesheet
 io.styles kernel literals math math.ranges models namespaces parser
 sequences system ui ui.gadgets ui.gadgets.books ui.gadgets.panes
-ui.gestures ui.pens.gradient ui.pens.solid ;
+ui.gestures ui.pens.gradient ui.pens.solid combinators.smart.syntax ;
 IN: slides
 
 CONSTANT: stylesheet
diff --git a/extra/tools/image-analyzer/graphviz/graphviz.factor b/extra/tools/image-analyzer/graphviz/graphviz.factor
index 1f50fb7cdd..385f4d9016 100644
--- a/extra/tools/image-analyzer/graphviz/graphviz.factor
+++ b/extra/tools/image-analyzer/graphviz/graphviz.factor
@@ -87,7 +87,7 @@ CONSTANT: node-colors {
 
 : <heap-graph> ( -- graph )
     <digraph>
-    [graph "dot" =layout ];
+    graph[ "dot" =layout ]
     <graph-attributes> "false" >>overlap add ;
 
 : image>graph ( image -- graph )
diff --git a/extra/ui/gadgets/charts/demos/demos.factor b/extra/ui/gadgets/charts/demos/demos.factor
index 3d8320275f..e71bda0b60 100644
--- a/extra/ui/gadgets/charts/demos/demos.factor
+++ b/extra/ui/gadgets/charts/demos/demos.factor
@@ -6,7 +6,9 @@ math.constants math.functions sequences ui ui.gadgets
 ui.gadgets.charts ui.gadgets.charts.axes ui.gadgets.charts.lines ;
 IN: ui.gadgets.charts.demos
 
-CONSTANT: -pi $[ pi neg ]
+<<
+CONSTANT: -pi 1[ pi neg ]
+>>
 
 : sine-wave ( steps -- seq )
     [ <iota> ] keep