Replace custom enumeration methods with delegation to Enumerator