Make skills iterators more efficient