Changed some enumerators to be deterministic.