Revert to old of_fast_enumeration_state_t as gcc 4.6 chokes on the new.