diff --git a/include/slang/util/Iterator.h b/include/slang/util/Iterator.h
index a2c4ea5b8..427107602 100644
--- a/include/slang/util/Iterator.h
+++ b/include/slang/util/Iterator.h
@@ -339,8 +339,9 @@ class iterator_facade {
 
     /// @brief Random access operator, requires <code>Derived::advance()</code>
     template<typename T = self_type, detail::advance_type_arg<T> D>
-    [[nodiscard]] constexpr decltype(auto) operator[](D off) const noexcept(
-        detail::has_nothrow_advance<self_type, D>&& detail::has_nothrow_dereference<self_type>) {
+    [[nodiscard]] constexpr decltype(auto) operator[](D off) const
+        noexcept(detail::has_nothrow_advance<self_type, D> &&
+                 detail::has_nothrow_dereference<self_type>) {
         return (self() + off).dereference();
     }
 
@@ -348,8 +349,8 @@ class iterator_facade {
     /// requires <code>Derived::distance_to()</code>
     template<detail::has_distance_to<self_type> T>
     [[nodiscard]] friend constexpr decltype(auto) operator-(
-        const T& left,
-        const self_type& right) noexcept(detail::has_nothrow_distance_to<T, self_type>) {
+        const T & left,
+        const self_type & right) noexcept(detail::has_nothrow_distance_to<T, self_type>) {
         return right.distance_to(left);
     }
 
@@ -357,8 +358,8 @@ class iterator_facade {
     /// requires <code>Derived::distance_to()</code>
     template<detail::has_distance_to<self_type> Sentinel>
     [[nodiscard]] friend constexpr decltype(auto) operator-(
-        const self_type& left,
-        const Sentinel& right) noexcept(detail::has_nothrow_distance_to<Sentinel, self_type>) {
+        const self_type & left,
+        const Sentinel & right) noexcept(detail::has_nothrow_distance_to<Sentinel, self_type>) {
         return -(right - left);
     }
 
diff --git a/tests/unittests/Test.h b/tests/unittests/Test.h
index e3518724f..0b169712b 100644
--- a/tests/unittests/Test.h
+++ b/tests/unittests/Test.h
@@ -6,7 +6,7 @@
 #ifdef _MSC_VER
 #    pragma warning(push)
 #    pragma warning( \
-            disable : 4459) // annoying warning about global "alloc" being shadowed by locals
+        disable : 4459) // annoying warning about global "alloc" being shadowed by locals
 #endif
 
 #include <catch2/catch_test_macros.hpp>
diff --git a/tests/unittests/ast/PortTests.cpp b/tests/unittests/ast/PortTests.cpp
index f24289a45..d13676851 100644
--- a/tests/unittests/ast/PortTests.cpp
+++ b/tests/unittests/ast/PortTests.cpp
@@ -47,7 +47,7 @@ module mh22(ref wire x); endmodule
         auto def = compilation.getRoot().find(moduleName);    \
         REQUIRE(def);                                         \
         auto& body = def->as<InstanceSymbol>().body;          \
-        auto& port = body.findPort(name)->as<PortSymbol>();   \
+        auto& port = body.findPort(name) -> as<PortSymbol>(); \
         CHECK(port.direction == ArgumentDirection::dir);      \
         CHECK(port.getType().toString() == (type));           \
         if (nt) {                                             \
@@ -125,7 +125,7 @@ module m6(I.bar bar); endmodule
         auto def = compilation.getDefinition(moduleName, compilation.getRoot()); \
         REQUIRE(def);                                                            \
         auto& inst = InstanceSymbol::createDefault(compilation, *def, nullptr);  \
-        auto& port = inst.body.findPort(name)->as<PortSymbol>();                 \
+        auto& port = inst.body.findPort(name) -> as<PortSymbol>();               \
         CHECK(port.direction == ArgumentDirection::dir);                         \
         CHECK(port.getType().toString() == (type));                              \
         if (nt) {                                                                \
@@ -139,7 +139,7 @@ module m6(I.bar bar); endmodule
         auto def = compilation.getDefinition(moduleName, compilation.getRoot()); \
         REQUIRE(def);                                                            \
         auto& inst = InstanceSymbol::createDefault(compilation, *def, nullptr);  \
-        auto& port = inst.body.findPort(portName)->as<InterfacePortSymbol>();    \
+        auto& port = inst.body.findPort(portName) -> as<InterfacePortSymbol>();  \
         REQUIRE(port.interfaceDef);                                              \
         CHECK(port.interfaceDef->name == (ifaceName));                           \
         if (*(modportName)) {                                                    \