@@ -35,5 +35,6 @@ paste = "1"
 roxmltree = "0.21"
 serde = { version = "1", default-features = false }
 serde_json = "1"
+smallvec = "1.16"
 svgtypes = "0.16"
-uom = "0.38"
+uom = "0.38"
@@ -1,7 +1,7 @@
 use std::{borrow::Cow, fmt::Debug};
 
 use ::g_code::{command, emit::Token};
-use lyon_geom::{Point, SvgArc};
+use lyon_geom::{LineSegment, Point, SvgArc};
 use rust_decimal::{Decimal, prelude::*};
 use svg2star::turtle::{
     Turtle,
@@ -140,18 +140,15 @@ impl Turtle for GCodeTurtle<'_> {
 
     fn stroke(&mut self, stroke: Stroke) {
         let start = stroke.start_point();
-        let mut commands = stroke.into_commands().peekable();
 
         self.tool_off();
 
         // Comments should be inline after tool_off but before a rapid move.
-        while matches!(commands.peek(), Some(DrawCommand::Comment(_))) {
-            if let Some(DrawCommand::Comment(comment)) = commands.next() {
-                self.program.push(Token::Comment {
-                    is_inline: false,
-                    inner: Cow::Owned(comment),
-                });
-            }
+        if let Some(comment) = stroke.comment() {
+            self.program.push(Token::Comment {
+                is_inline: false,
+                inner: Cow::Owned(comment.to_owned()),
+            });
         }
 
         self.program.append(
@@ -163,9 +160,9 @@ impl Turtle for GCodeTurtle<'_> {
         );
         self.tool_on();
 
-        for command in commands {
+        for command in stroke.into_commands() {
             match command {
-                DrawCommand::LineTo { from: _, to } => {
+                DrawCommand::LineTo(LineSegment { from: _, to }) => {
                     self.program.append(
                         &mut command!(LinearInterpolation {
                             X: self.round(to.x),
@@ -248,12 +245,6 @@ impl Turtle for GCodeTurtle<'_> {
                         }
                     }
                 }
-                DrawCommand::Comment(comment) => {
-                    self.program.push(Token::Comment {
-                        is_inline: false,
-                        inner: Cow::Owned(comment),
-                    });
-                }
             }
         }
     }
 
@@ -930,7 +930,6 @@ G1 X133.707 Y112.443 F300
 G1 X133.716 Y112.143 F300
 G1 X133.717 Y112.053 F300;svg#svg1 > g#layer1 > polygon#polygon1
 G0 X12.575 Y173.877
-G1 X12.575 Y173.877 F300
 G1 X8.009 Y179.602 F300
 G1 X9.639 Y186.741 F300
 G1 X16.236 Y189.919 F300
@@ -939,7 +938,6 @@ G1 X24.463 Y179.602 F300
 G1 X42.162 Y169.979 F300
 G1 X12.575 Y173.877 F300;svg#svg1 > g#layer1 > polyline#polyline1
 G0 X76.339 Y112.397
-G1 X76.339 Y112.397 F300
 G1 X71.773 Y118.122 F300
 G1 X73.402 Y125.261 F300
 G1 X80 Y128.439 F300