minor cleanup.
ErrorMessageFilter: Eliminated potential "dictionary changed size during iteration" error.