diff --git a/src/dom/implementation.zig b/src/dom/implementation.zig
index c8b03959..f577f634 100644
--- a/src/dom/implementation.zig
+++ b/src/dom/implementation.zig
@@ -42,14 +42,14 @@ pub const DOMImplementation = struct {
     ) !*parser.Document {
         _ = self;
         var cnamespace: ?[:0]const u8 = null;
-        if (namespace != null) {
-            cnamespace = try allocator.dupeZ(u8, namespace.?);
+        if (namespace) |ns| {
+            cnamespace = try allocator.dupeZ(u8, ns);
             defer allocator.free(cnamespace.?);
         }
 
         var cqname: ?[:0]const u8 = null;
-        if (qname != null) {
-            cqname = try allocator.dupeZ(u8, qname.?);
+        if (qname) |qn| {
+            cqname = try allocator.dupeZ(u8, qn);
             defer allocator.free(cqname.?);
         }
 
diff --git a/src/netsurf.zig b/src/netsurf.zig
index 774fed62..5a6bb796 100644
--- a/src/netsurf.zig
+++ b/src/netsurf.zig
@@ -831,13 +831,13 @@ pub inline fn domImplementationCreateDocument(namespace: ?[:0]const u8, qname: ?
     var doc: ?*Document = undefined;
 
     var ptrnamespace: [*c]const u8 = null;
-    if (namespace != null) {
-        ptrnamespace = namespace.?.ptr;
+    if (namespace) |ns| {
+        ptrnamespace = ns.ptr;
     }
 
     var ptrqname: [*c]const u8 = null;
-    if (qname != null) {
-        ptrqname = qname.?.ptr;
+    if (qname) |qn| {
+        ptrqname = qn.ptr;
     }
 
     _ = c.dom_implementation_create_document(