diff --git a/compiler/semgnrc.nim b/compiler/semgnrc.nim
index 67b4b5a907e73..6fefc2233558c 100644
--- a/compiler/semgnrc.nim
+++ b/compiler/semgnrc.nim
@@ -226,14 +226,7 @@ proc semGenericStmt(c: PContext, n: PNode,
     var mixinContext = false
     if s != nil:
       incl(s.flags, sfUsed)
-      # more robust/future proof than:
-      # mixinContext = s.magic in {mDefined, mDefinedInScope, mCompiles, mAstToStr}
-      if s.magic != mNone and s.typ != nil:
-        for i in 1..<s.typ.len:
-          if s.typ[i].kind == tyUntyped:
-            mixinContext = true
-            break
-
+      mixinContext = s.magic in {mDefined, mDefinedInScope, mCompiles, mAstToStr}
       let sc = symChoice(c, fn, s, if s.isMixedIn: scForceOpen else: scOpen)
       case s.kind
       of skMacro:
@@ -290,9 +283,6 @@ proc semGenericStmt(c: PContext, n: PNode,
     # is not exported and yet the generic 'threadProcWrapper' works correctly.
     let flags = if mixinContext: flags+{withinMixin} else: flags
     for i in first..<result.safeLen:
-      # instead, would be better to only set `withinMixin` for arguments of
-      # kind tyUntyped, eg `if s.typ[i].kind == tyUntyped:`, however, this
-      # currently doesn't work
       result[i] = semGenericStmt(c, result[i], flags, ctx)
   of nkCurlyExpr:
     result = newNodeI(nkCall, n.info)
diff --git a/lib/system.nim b/lib/system.nim
index 6f963c9de708c..602fbc1f11cf1 100644
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -1629,7 +1629,7 @@ else:
       result[i+1] = y[i]
 
 
-proc astToStr*(x: untyped): string {.magic: "AstToStr", noSideEffect.}
+proc astToStr*[T](x: T): string {.magic: "AstToStr", noSideEffect.}
   ## Converts the AST of `x` into a string representation. This is very useful
   ## for debugging.