Corrections to build order issues in VS.

Split IEnumerator and Enumerator apart.