Tweaked for some more log event suppression.