Index: src/tests/vector/array.c
===================================================================
--- src/tests/vector/array.c	(revision 092528b3dc4eee675a06ce2ba685ca3eb083d603)
+++ src/tests/vector/array.c	(revision 4a9ccc35f7b5fed64bf53eee245fc9caa37f687d)
@@ -16,11 +16,8 @@
 #include "array.h"
 
-/// forall( otype array_type, elt_type | bounded_array( array_type, elt_type ) )
-/// [ array_iterator begin, array_iterator end ]
-/// get_iterators( array_type array )
-/// {
-///   begin = 0;
-///   end = last( array );
-/// }
+forall( otype array_type, otype elt_type | bounded_array( array_type, elt_type ) )
+[ elt_type * begin, elt_type * end ] get_iterators( array_type * array ) {
+	return [ begin( array ), end( array ) ];
+}
 
 // The first element is always at index 0.
Index: src/tests/vector/array.h
===================================================================
--- src/tests/vector/array.h	(revision 092528b3dc4eee675a06ce2ba685ca3eb083d603)
+++ src/tests/vector/array.h	(revision 4a9ccc35f7b5fed64bf53eee245fc9caa37f687d)
@@ -32,8 +32,6 @@
 // implement iterator_for
 
-typedef int array_iterator;
-
-/// forall( otype array_type, elt_type | bounded_array( array_type, elt_type ) )
-/// [ array_iterator begin, array_iterator end ] get_iterators( array_type );
+forall( otype array_type, otype elt_type | bounded_array( array_type, elt_type ) )
+[ elt_type * begin, elt_type * end ] get_iterators( array_type * );