diff --git a/dub.json b/dub.json
index 515d64d..c3bfe47 100644
--- a/dub.json
+++ b/dub.json
@@ -4,7 +4,7 @@
     "targetType": "autodetect",
     "license": "BSL-1.0",
     "dependencies": {
-        "dmd": "~>2.106.0-beta.1"
+        "dmd": "~>2.107.0-beta.1"
     },
     "targetPath": "bin/",
     "targetName": "dfmt",
diff --git a/src/dfmt/ast.d b/src/dfmt/ast.d
index 649973f..aa2f9a2 100644
--- a/src/dfmt/ast.d
+++ b/src/dfmt/ast.d
@@ -2144,6 +2144,11 @@ extern (C++) class FormatVisitor : SemanticTimeTransitiveVisitor
             write('}');
         }
 
+        void visitDefault(DefaultInitializer di)
+        {
+            write("{ }");
+        }
+
         mixin VisitInitializer!void visit;
         visit.VisitInitializer(inx);
     }
@@ -2164,8 +2169,6 @@ extern (C++) class FormatVisitor : SemanticTimeTransitiveVisitor
         }
         else if (auto e = isExpression(oarg))
         {
-            if (e.op == EXP.variable)
-                e = e.optimize(WANTvalue); // added to fix https://issues.dlang.org/show_bug.cgi?id=7375
             writeExprWithPrecedence(e, PREC.assign);
         }
         else if (ASTCodegen.Dsymbol s = isDsymbol(oarg))
@@ -2236,7 +2239,6 @@ extern (C++) class FormatVisitor : SemanticTimeTransitiveVisitor
         if (e.type == Type.tsize_t)
         {
             ASTCodegen.Expression ex = (e.op == EXP.cast_ ? (cast(ASTCodegen.CastExp) e).e1 : e);
-            ex = ex.optimize(WANTvalue);
             const ulong uval = ex.op == EXP.int64 ? ex.toInteger() : cast(ulong)-1;
             if (cast(long) uval >= 0)
             {