diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index eae3ac7..68a2b1c 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -207,7 +207,7 @@ private:
         }
         else if (currentIs(tok!"with"))
         {
-            if (indents.length == 0 || (indents.top != tok!"switch" && indents.top != tok!"with"))
+            if (indents.length == 0 || !indents.topIsOneOf(tok!"switch", tok!"with"))
                 indents.push(tok!"with");
             writeToken();
             write(" ");
@@ -732,13 +732,14 @@ private:
             writeToken();
             indents.popWrapIndents();
             linebreakHints = [];
-            while (indents.topIsOneOf(tok!"enum", tok!"try", tok!"catch", tok!"finally"))
+            while (indents.topIsOneOf(tok!"enum", tok!"try", tok!"catch", tok!"finally", tok!"debug"))
                 indents.pop();
             if (indents.topAre(tok!"static", tok!"else"))
             {
                 indents.pop();
                 indents.pop();
             }
+            indentLevel = indents.indentLevel;
             if (config.dfmt_brace_style == BraceStyle.allman)
             {
                 if (!currentIs(tok!"{"))
@@ -1552,7 +1553,7 @@ private:
             else
             {
                 if (indents.topIsTemp() && (peekBackIsOneOf(true, tok!"}",
-                        tok!";") && indents.top != tok!";"))
+                        tok!";") && !indents.topIs(tok!";")))
                     indents.popTempIndents();
                 indentLevel = indents.indentLevel;
             }
diff --git a/tests/allman/debug_with_param.d.ref b/tests/allman/debug_with_param.d.ref
new file mode 100644
index 0000000..b2c9baa
--- /dev/null
+++ b/tests/allman/debug_with_param.d.ref
@@ -0,0 +1,7 @@
+void main()
+{
+    debug (0)
+        foo();
+    else
+        bar();
+}
diff --git a/tests/debug_with_param.d b/tests/debug_with_param.d
new file mode 100644
index 0000000..d13fd86
--- /dev/null
+++ b/tests/debug_with_param.d
@@ -0,0 +1,4 @@
+void main()
+{
+debug(0) foo(); else bar();
+}
diff --git a/tests/otbs/debug_with_param.d.ref b/tests/otbs/debug_with_param.d.ref
new file mode 100644
index 0000000..9b9cf75
--- /dev/null
+++ b/tests/otbs/debug_with_param.d.ref
@@ -0,0 +1,6 @@
+void main() {
+    debug (0)
+        foo();
+    else
+        bar();
+}