Refactoring to use EdgeEnumerators everywhere.