No more 'dictionary changed size during iteration'