Cleanup naming, prior to coming changes, to more clearly delineate the different roles. EnumeratorDelegates become EnumeratorStrategies, EnumeratorWrappers become EnumeratorAdapters.