diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 8c01e34..37ff0d8 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -599,7 +599,7 @@ private:
 
     void formatSwitch()
     {
-        if (indents.topIs(tok!"with"))
+        while (indents.topIs(tok!"with"))
             indents.pop();
         indents.push(tok!"switch");
         writeToken(); // switch
@@ -847,15 +847,35 @@ private:
         case tok!"..":
         case tok!"%":
         binary:
-            if (linebreakHints.canFind(index) || peekIs(tok!"comment", false))
+            immutable bool isWrapToken = linebreakHints.canFind(index) || peekIs(tok!"comment", false);
+            if (config.dfmt_split_operator_at_line_end)
             {
-                pushWrapIndent();
-                newline();
+                if (isWrapToken)
+                {
+                    pushWrapIndent();
+                    write(" ");
+                    writeToken();
+                    newline();
+                }
+                else
+                {
+                    write(" ");
+                    writeToken();
+                    write(" ");
+                }
             }
             else
+            {
+                if (isWrapToken)
+                {
+                    pushWrapIndent();
+                    newline();
+                }
+                else
+                    write(" ");
+                writeToken();
                 write(" ");
-            writeToken();
-            write(" ");
+            }
             break;
         default:
             writeToken();
diff --git a/src/dfmt/main.d b/src/dfmt/main.d
index 8409b5c..39f0211 100644
--- a/src/dfmt/main.d
+++ b/src/dfmt/main.d
@@ -16,7 +16,7 @@ else
     import dfmt.formatter : format;
     import std.path : buildPath, expandTilde;
     import dfmt.editorconfig : getConfigFor;
-    import std.getopt : getopt;
+    import std.getopt : getopt, GetOptException;
 
     int main(string[] args)
     {
@@ -28,10 +28,13 @@ else
         void handleBooleans(string option, string value)
         {
             import dfmt.editorconfig : OptionalBoolean;
-            import std.exception : enforce;
-            enforce(value == "true" || value == "false", "Invalid argument");
+            import std.exception : enforceEx;
+            enforceEx!GetOptException(value == "true" || value == "false", "Invalid argument");
             switch (option)
             {
+            case "align_switch_statements":
+                optConfig.dfmt_align_switch_statements = value == "true" ? OptionalBoolean.t : OptionalBoolean.f;
+                break;
             case "outdent_attributes":
                 optConfig.dfmt_outdent_attributes = value == "true" ? OptionalBoolean.t : OptionalBoolean.f;
                 break;
@@ -48,21 +51,29 @@ else
             }
         }
 
-        getopt(args,
-            "align_switch_statements", &optConfig.dfmt_align_switch_statements,
-            "brace_style", &optConfig.dfmt_brace_style,
-            "end_of_line", &optConfig.end_of_line,
-            "help|h", &showHelp,
-            "indent_size", &optConfig.indent_size,
-            "indent_style|t", &optConfig.indent_style,
-            "inplace", &inplace,
-            "max_line_length", &optConfig.max_line_length,
-            "max_line_length", &optConfig.max_line_length,
-            "outdent_attributes", &handleBooleans,
-            "outdent_labels", &handleBooleans,
-            "space_after_cast", &handleBooleans,
-            "split_operator_at_line_end", &handleBooleans,
-            "tab_width", &optConfig.tab_width);
+        try
+        {
+            getopt(args,
+                "align_switch_statements", &handleBooleans,
+                "brace_style", &optConfig.dfmt_brace_style,
+                "end_of_line", &optConfig.end_of_line,
+                "help|h", &showHelp,
+                "indent_size", &optConfig.indent_size,
+                "indent_style|t", &optConfig.indent_style,
+                "inplace", &inplace,
+                "max_line_length", &optConfig.max_line_length,
+                "max_line_length", &optConfig.max_line_length,
+                "outdent_attributes", &handleBooleans,
+                "outdent_labels", &handleBooleans,
+                "space_after_cast", &handleBooleans,
+                "split_operator_at_line_end", &handleBooleans,
+                "tab_width", &optConfig.tab_width);
+        }
+        catch (GetOptException e)
+        {
+            stderr.writeln(e.msg);
+            return 1;
+        }
 
         if (showHelp)
         {
diff --git a/tests/allman/issue0035.d.ref b/tests/allman/issue0035.d.ref
new file mode 100644
index 0000000..f64e94f
--- /dev/null
+++ b/tests/allman/issue0035.d.ref
@@ -0,0 +1,7 @@
+unittest
+{
+    if (some_very_long_expression && some_very_long_expression &&
+            some_very_long_expression && some_very_long_expression && some_very_long_expression)
+    {
+    }
+}
diff --git a/tests/issue0035.args b/tests/issue0035.args
new file mode 100644
index 0000000..754b746
--- /dev/null
+++ b/tests/issue0035.args
@@ -0,0 +1 @@
+--split_operator_at_line_end=true
diff --git a/tests/issue0035.d b/tests/issue0035.d
new file mode 100644
index 0000000..d30ef69
--- /dev/null
+++ b/tests/issue0035.d
@@ -0,0 +1,8 @@
+unittest
+{
+    if (some_very_long_expression && some_very_long_expression
+        && some_very_long_expression && some_very_long_expression
+        && some_very_long_expression)
+    {
+    }
+}
diff --git a/tests/otbs/issue0035.d.ref b/tests/otbs/issue0035.d.ref
new file mode 100644
index 0000000..0394671
--- /dev/null
+++ b/tests/otbs/issue0035.d.ref
@@ -0,0 +1,5 @@
+unittest {
+    if (some_very_long_expression && some_very_long_expression &&
+            some_very_long_expression && some_very_long_expression && some_very_long_expression) {
+    }
+}