Speculative check-in of a change that may help Ewan with a
ConcurrentModificationException he was seeing.