Move away from enumerator based transition logic...

…as you cannot be sure of enumerator positions