You shouldn't need the `.tolist()` calls after #361