Minor cleansing after merge; fixed one potential
ConcurrentModificationException