diff --git a/compiler/int128.nim b/compiler/int128.nim
index 6968b1f892..18e751f989 100644
--- a/compiler/int128.nim
+++ b/compiler/int128.nim
@@ -573,4 +573,4 @@ proc maskBytes*(arg: Int128, numbytes: int): Int128 {.noinit.} =
   of 8:
     return maskUInt64(arg)
   else:
-    assert(false, "masking only implemented for 1, 2, 4 and 8 bytes")
+    raiseAssert "masking only implemented for 1, 2, 4 and 8 bytes"
diff --git a/compiler/reorder.nim b/compiler/reorder.nim
index a96841bcad..aedebc7d42 100644
--- a/compiler/reorder.nim
+++ b/compiler/reorder.nim
@@ -252,6 +252,7 @@ proc hasCommand(n: PNode): bool =
   of nkStmtList, nkStmtListExpr, nkWhenStmt, nkElifBranch, nkElse,
       nkStaticStmt, nkLetSection, nkConstSection, nkVarSection,
       nkIdentDefs:
+    result = false
     for a in n:
       if a.hasCommand:
         return true
diff --git a/compiler/sempass2.nim b/compiler/sempass2.nim
index 30050f25d2..0954f42fd0 100644
--- a/compiler/sempass2.nim
+++ b/compiler/sempass2.nim
@@ -356,12 +356,13 @@ proc useVar(a: PEffects, n: PNode) =
 type
   TIntersection = seq[tuple[id, count: int]] # a simple count table
 
-proc addToIntersection(inter: var TIntersection, s: int, zeroInit: bool) =
+proc addToIntersection(inter: var TIntersection, s: int, initOnly: bool) =
   for j in 0..<inter.len:
     if s == inter[j].id:
-      inc inter[j].count
+      if not initOnly:
+        inc inter[j].count
       return
-  if zeroInit:
+  if initOnly:
     inter.add((id: s, count: 0))
   else:
     inter.add((id: s, count: 1))
diff --git a/compiler/types.nim b/compiler/types.nim
index 3160583787..4dc9d36f5f 100644
--- a/compiler/types.nim
+++ b/compiler/types.nim
@@ -1753,6 +1753,7 @@ proc isTupleRecursive(t: PType, cycleDetector: var IntSet): bool =
     return true
   case t.kind
   of tyTuple:
+    result = false
     var cycleDetectorCopy: IntSet
     for i in 0..<t.len:
       cycleDetectorCopy = cycleDetector