Bug 1088787 - Clean-up from simplifying verified event