Removing more un-needed array-buffer to iterator conversions