Move assertion into block - otherwise we get failures due to the collection being mutated whilst we're checking it
Merge commit '631b4'