diff --git a/lib/Slic3r/Extruder.pm b/lib/Slic3r/Extruder.pm
index 1ac5ed8a8..2e357cac7 100644
--- a/lib/Slic3r/Extruder.pm
+++ b/lib/Slic3r/Extruder.pm
@@ -242,7 +242,7 @@ sub retract {
     
     # reset extrusion distance during retracts
     # this makes sure we leave sufficient precision in the firmware
-    if (!$Slic3r::use_relative_e_distances && $Slic3r::gcode_flavor !~ /^(?:mach3|makerbot)$/) {
+    if (!$Slic3r::use_relative_e_distances && $Slic3r::gcode_flavor ne 'mach3') {
         $gcode .= "G92 " . $Slic3r::extrusion_axis . "0\n" if $Slic3r::extrusion_axis;
         $self->extrusion_distance(0);
     }
diff --git a/lib/Slic3r/ExtrusionPath.pm b/lib/Slic3r/ExtrusionPath.pm
index fe8089127..6a2df2740 100644
--- a/lib/Slic3r/ExtrusionPath.pm
+++ b/lib/Slic3r/ExtrusionPath.pm
@@ -27,13 +27,12 @@ has 'role'         => (is => 'rw', required => 1);
 use constant EXTR_ROLE_PERIMETER                    => 0;
 use constant EXTR_ROLE_SMALLPERIMETER               => 1;
 use constant EXTR_ROLE_CONTOUR_INTERNAL_PERIMETER   => 2;
-use constant EXTR_ROLE_EXTERNAL_PERIMETER           => 3;
-use constant EXTR_ROLE_FILL                         => 4;
-use constant EXTR_ROLE_SOLIDFILL                    => 5;
-use constant EXTR_ROLE_TOPSOLIDFILL                 => 6;
-use constant EXTR_ROLE_BRIDGE                       => 7;
-use constant EXTR_ROLE_SKIRT                        => 8;
-use constant EXTR_ROLE_SUPPORTMATERIAL              => 9;
+use constant EXTR_ROLE_FILL                         => 3;
+use constant EXTR_ROLE_SOLIDFILL                    => 4;
+use constant EXTR_ROLE_TOPSOLIDFILL                 => 5;
+use constant EXTR_ROLE_BRIDGE                       => 6;
+use constant EXTR_ROLE_SKIRT                        => 7;
+use constant EXTR_ROLE_SUPPORTMATERIAL              => 8;
 
 sub BUILD {
     my $self = shift;