diff --git a/spec/compiler/semantic/macro_spec.cr b/spec/compiler/semantic/macro_spec.cr
index 193100614314..b62dd425348e 100644
--- a/spec/compiler/semantic/macro_spec.cr
+++ b/spec/compiler/semantic/macro_spec.cr
@@ -1049,7 +1049,7 @@ describe "Semantic: macro" do
         class A
         end
 
-        {% skip_file() %}
+        {% skip_file %}
 
         class B
         end
@@ -1066,7 +1066,7 @@ describe "Semantic: macro" do
 
         {% if true %}
           class C; end
-          {% skip_file() %}
+          {% skip_file %}
           class D; end
         {% end %}
 
diff --git a/src/callstack.cr b/src/callstack.cr
index a11f5ae129a6..23c2e2dd349b 100644
--- a/src/callstack.cr
+++ b/src/callstack.cr
@@ -1,4 +1,4 @@
-{% skip_file() if flag?(:win32) %}
+{% skip_file if flag?(:win32) %}
 
 require "c/dlfcn"
 require "c/stdio"
diff --git a/src/compiler/crystal/macros/interpreter.cr b/src/compiler/crystal/macros/interpreter.cr
index ae26d9cbc566..f2f1ff7d5427 100644
--- a/src/compiler/crystal/macros/interpreter.cr
+++ b/src/compiler/crystal/macros/interpreter.cr
@@ -77,7 +77,7 @@ module Crystal
                    @scope : Type, @path_lookup : Type, @location : Location?,
                    @vars = {} of String => ASTNode, @block : Block? = nil, @def : Def? = nil,
                    @in_macro = false)
-      @str = IO::Memory.new(512) # Can't be String::Builder because of `{{debug()}}
+      @str = IO::Memory.new(512) # Can't be String::Builder because of `{{debug}}`
       @last = Nop.new
     end
 
diff --git a/src/crystal/system/unix/arc4random.cr b/src/crystal/system/unix/arc4random.cr
index 863c0978eb3f..67aa0867560a 100644
--- a/src/crystal/system/unix/arc4random.cr
+++ b/src/crystal/system/unix/arc4random.cr
@@ -1,4 +1,4 @@
-{% skip_file() unless flag?(:openbsd) %}
+{% skip_file unless flag?(:openbsd) %}
 
 require "c/stdlib"
 
diff --git a/src/crystal/system/unix/getrandom.cr b/src/crystal/system/unix/getrandom.cr
index 95b2828feca3..f56eb399d6e8 100644
--- a/src/crystal/system/unix/getrandom.cr
+++ b/src/crystal/system/unix/getrandom.cr
@@ -1,4 +1,4 @@
-{% skip_file() unless flag?(:linux) %}
+{% skip_file unless flag?(:linux) %}
 
 require "c/unistd"
 require "c/sys/syscall"
diff --git a/src/crystal/system/unix/sysconf_cpucount.cr b/src/crystal/system/unix/sysconf_cpucount.cr
index 58eed376da5c..9c0550928092 100644
--- a/src/crystal/system/unix/sysconf_cpucount.cr
+++ b/src/crystal/system/unix/sysconf_cpucount.cr
@@ -1,4 +1,4 @@
-{% skip_file() if flag?(:openbsd) || flag?(:freebsd) %}
+{% skip_file if flag?(:openbsd) || flag?(:freebsd) %}
 
 require "c/unistd"
 
diff --git a/src/crystal/system/unix/sysctl_cpucount.cr b/src/crystal/system/unix/sysctl_cpucount.cr
index f5646b1b0377..ec3a55852fe8 100644
--- a/src/crystal/system/unix/sysctl_cpucount.cr
+++ b/src/crystal/system/unix/sysctl_cpucount.cr
@@ -1,4 +1,4 @@
-{% skip_file() unless flag?(:openbsd) || flag?(:freebsd) %}
+{% skip_file unless flag?(:openbsd) || flag?(:freebsd) %}
 
 require "c/sysctl"
 
diff --git a/src/crystal/system/unix/urandom.cr b/src/crystal/system/unix/urandom.cr
index a11d076f5839..deb037ee2bca 100644
--- a/src/crystal/system/unix/urandom.cr
+++ b/src/crystal/system/unix/urandom.cr
@@ -1,5 +1,4 @@
-# TODO: replace with `flag?(:unix) && !flag?(:openbsd) && !flag?(:linux)` after crystal > 0.22.0 is released
-{% skip_file() if flag?(:openbsd) && flag?(:linux) %}
+{% skip_file unless flag?(:unix) && !flag?(:openbsd) && !flag?(:linux) %}
 
 module Crystal::System::Random
   @@initialized = false
diff --git a/src/io/console.cr b/src/io/console.cr
index da639da274d2..6a7fad53076f 100644
--- a/src/io/console.cr
+++ b/src/io/console.cr
@@ -1,4 +1,4 @@
-{% skip_file() if flag?(:win32) %}
+{% skip_file if flag?(:win32) %}
 
 require "termios"
 
diff --git a/src/io/encoding.cr b/src/io/encoding.cr
index dcd9c47c35de..955e5dc26914 100644
--- a/src/io/encoding.cr
+++ b/src/io/encoding.cr
@@ -15,7 +15,7 @@ class IO
     end
   end
 
-  {% skip_file() if flag?(:win32) %}
+  {% skip_file if flag?(:win32) %}
 
   private class Encoder
     def initialize(@encoding_options : EncodingOptions)
diff --git a/src/io/syscall.cr b/src/io/syscall.cr
index f7e9f0b7651c..4bf93b9b638f 100644
--- a/src/io/syscall.cr
+++ b/src/io/syscall.cr
@@ -1,4 +1,4 @@
-{% skip_file() if flag?(:win32) %}
+{% skip_file if flag?(:win32) %}
 
 module IO::Syscall
   @read_timed_out = false