Fixup port of EventViewController.