Finished fixing arrays with generic enumerables, and also fixed yield generators