Same comment as before with putting it on one line; also, perhaps we can just do this at the start of the loop so that we only do it in one place?