Reintegtrated tolist() optimization that got lost.