simplify and speed up initial target enumeration with enumerator