diff --git a/ChangeLog b/ChangeLog
index 402dafd7b..ecc54c244 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-07  Mike Kestner <mkestner@speakeasy.net>
+
+	* generator/CodeGenerator.cs : Refactor generatable iteration.
+	* generator/SymbolTable.cs : Add Generatables property to expose complex_types.Values.
+
 2002-03-02  Mike Kestner <mkestner@speakeasy.net>
 
 	* makefile : add linux build.
diff --git a/generator/CodeGenerator.cs b/generator/CodeGenerator.cs
index 7ad954cbb..5c9fa0714 100644
--- a/generator/CodeGenerator.cs
+++ b/generator/CodeGenerator.cs
@@ -23,9 +23,7 @@ namespace GtkSharp.Generation {
 			SymbolTable table = p.Parse ();
 			Console.WriteLine (table.Count + " types parsed.");
 			
-			IDictionaryEnumerator de = table.GetEnumerator();
-			while (de.MoveNext()) {
-				IGeneratable gen = (IGeneratable) de.Value;
+			foreach (IGeneratable gen in table.Generatables) {
 				gen.Generate (table);
 			}
 
diff --git a/generator/SymbolTable.cs b/generator/SymbolTable.cs
index f6d143283..c110fecff 100644
--- a/generator/SymbolTable.cs
+++ b/generator/SymbolTable.cs
@@ -84,9 +84,10 @@ namespace GtkSharp.Generation {
 			}
 		}
 		
-		public IDictionaryEnumerator GetEnumerator()
-		{
-			return complex_types.GetEnumerator();
+		public IEnumerable Generatables {
+			get {
+				return complex_types.Values;
+			}
 		}
 		
 		private String Trim(String type)