diff --git a/lib/ActiveRecord.php b/lib/ActiveRecord.php
index 73fc2a6..1c4438b 100644
--- a/lib/ActiveRecord.php
+++ b/lib/ActiveRecord.php
@@ -29,7 +29,7 @@
  * @see self::get_primary_key_value()
  * @property-read TKey $primary_key_value The value of the primary key.
  *
- * @template TKey of int|non-empty-string|non-empty-array<non-empty-string>
+ * @template TKey of scalar|scalar[]
  */
 abstract class ActiveRecord extends Prototyped
 {
diff --git a/lib/ActiveRecord/Model.php b/lib/ActiveRecord/Model.php
index bb129ee..4399e93 100644
--- a/lib/ActiveRecord/Model.php
+++ b/lib/ActiveRecord/Model.php
@@ -15,7 +15,7 @@
 /**
  * Base class for activerecord models.
  *
- * @template TKey of int|non-empty-string|non-empty-string[]
+ * @template TKey of scalar|scalar[]
  * @template TValue of ActiveRecord
  *
  * @property-read Model|null $parent Parent model.
diff --git a/lib/ActiveRecord/ModelProvider.php b/lib/ActiveRecord/ModelProvider.php
index 2cac981..97619b2 100644
--- a/lib/ActiveRecord/ModelProvider.php
+++ b/lib/ActiveRecord/ModelProvider.php
@@ -16,7 +16,7 @@ interface ModelProvider
      *
      * @param class-string<T> $activerecord_class
      *
-     * @phpstan-return Model<int|non-empty-string|non-empty-string[], T>
+     * @phpstan-return Model<scalar|scalar[], T>
      */
     public function model_for_record(string $activerecord_class): Model;
 }
diff --git a/lib/ActiveRecord/Relation.php b/lib/ActiveRecord/Relation.php
index 1d8f174..03e3441 100644
--- a/lib/ActiveRecord/Relation.php
+++ b/lib/ActiveRecord/Relation.php
@@ -73,7 +73,7 @@ protected function resolve_related_model(): Model
      *
      * @param class-string<T> $activerecord_class
      *
-     * @return Model<int|non-empty-string|non-empty-string[], T>
+     * @return Model<scalar|scalar[], T>
      */
     protected function model_for_activerecord(string $activerecord_class): Model
     {
diff --git a/lib/ActiveRecord/StaticModelProvider.php b/lib/ActiveRecord/StaticModelProvider.php
index 05b51ee..10ab398 100644
--- a/lib/ActiveRecord/StaticModelProvider.php
+++ b/lib/ActiveRecord/StaticModelProvider.php
@@ -12,7 +12,7 @@
 final class StaticModelProvider
 {
     /**
-     * @var (Closure(): ModelProvider)|null
+     * @var (Closure():ModelProvider)|null
      */
     private static ?Closure $factory = null;
 
@@ -21,10 +21,10 @@ final class StaticModelProvider
     /**
      * Sets the {@see ModelProvider} factory.
      *
-     * @param (callable(): ModelProvider) $factory
+     * @param (callable():ModelProvider) $factory
      *     The factory is invoked once: the first time {@see model_for_record} is invoked.
      *
-     * @return (callable(): ModelProvider)|null
+     * @return (callable():ModelProvider)|null
      *     The previous factory, or `null` if none was defined.
      */
     public static function set(callable $factory): ?callable
@@ -40,7 +40,7 @@ public static function set(callable $factory): ?callable
     /**
      * Returns the current {@see ModelProvider} factory.
      *
-     * @return (callable(): ModelProvider)|null
+     * @return (callable():ModelProvider)|null
      */
     public static function get(): ?callable
     {
@@ -63,7 +63,7 @@ public static function reset(): void
      *
      * @param class-string<T> $activerecord_class
      *
-     * @phpstan-return Model<int|non-empty-string|non-empty-string[], T>
+     * @phpstan-return Model<scalar|scalar[], T>
      **/
     public static function model_for_record(string $activerecord_class): Model
     {