Possible fix for enumeration bug? The code in ExtensionIterator.cpp is a crime... In serious need of review / rewriting.