diff --git a/src/Record/Collector/Hook_Collector.php b/src/Record/Collector/Hook_Collector.php
index 4924bf7..6bda186 100644
--- a/src/Record/Collector/Hook_Collector.php
+++ b/src/Record/Collector/Hook_Collector.php
@@ -78,7 +78,6 @@ class Hook_Collector extends Stopwatch_Collector {
 		/**
 		 * @var int|string $key
 		 * @var array      $data
-		 * @psalm-var array{0:string} $data
 		 */
 		foreach ( $stops as $key => $data ) {
 
diff --git a/src/Record/Iterator/Recursive_Record_Iterator.php b/src/Record/Iterator/Recursive_Record_Iterator.php
index 5929d52..2fd2913 100644
--- a/src/Record/Iterator/Recursive_Record_Iterator.php
+++ b/src/Record/Iterator/Recursive_Record_Iterator.php
@@ -7,6 +7,9 @@ use Rarst\Laps\Record\Record_Interface;
 
 /**
  * Processes records, recursively bumping overlapping ones to children.
+ *
+ * @template-extends \ArrayIterator<array-key,Record_Interface>
+ * @template-implements \RecursiveIterator<array-key,Record_Interface>
  */
 class Recursive_Record_Iterator extends \ArrayIterator implements \RecursiveIterator {
 
@@ -15,7 +18,7 @@ class Recursive_Record_Iterator extends \ArrayIterator implements \RecursiveIter
 
 	/**
 	 * @param Record_Interface[] $records Records to process.
-	 * @param int                $flags   Configuration flags.
+	 * @psalm-param 0|1|2|3      $flags   Configuration flags.
 	 */
 	public function __construct( array $records, int $flags = 0 ) {
 
diff --git a/src/Record/Iterator/Timeline_Iterator.php b/src/Record/Iterator/Timeline_Iterator.php
index 3d75952..2498c19 100644
--- a/src/Record/Iterator/Timeline_Iterator.php
+++ b/src/Record/Iterator/Timeline_Iterator.php
@@ -5,11 +5,12 @@ namespace Rarst\Laps\Record\Iterator;
 
 use Rarst\Laps\Record\Record;
 use Rarst\Laps\Record\Record_Interface;
-use Rarst\Laps\Record\Iterator\Recursive_Record_Iterator;
 
 /**
  * Processes records into sets for display by template.
  *
+ * @template-implements \Iterator<array>
+ *
  * @psalm-suppress PropertyNotSetInConstructor
  */
 class Timeline_Iterator implements \Iterator {