Fixes for Enumerator#with_index #550