--- a/dmd/TemplateInstance.d	Fri Sep 03 23:55:51 2010 +0100
+++ b/dmd/TemplateInstance.d	Sat Sep 04 01:33:05 2010 +0100
@@ -337,9 +337,8 @@
 		 * implements the typeargs. If so, just refer to that one instead.
 		 */
 
-		for (size_t i = 0; i < tempdecl.instances.dim; i++)
+		foreach (ti; tempdecl.instances)
 		{
-			TemplateInstance ti = cast(TemplateInstance)tempdecl.instances.data[i];
 		version (LOG) {
 			printf("\t%s: checking for match with instance %d (%p): '%s'\n", toChars(), i, ti, ti.toChars());
 		}
@@ -385,7 +384,7 @@
 		uint errorsave = global.errors;
 		inst = this;
 		int tempdecl_instance_idx = tempdecl.instances.dim;
-		tempdecl.instances.push(cast(void*)this);
+		tempdecl.instances.push(this);
 		parent = tempdecl.parent;
 		//printf("parent = '%s'\n", parent.kind());