Improve DSL: Make EventHandler's type argument contravariaant.
Add missing @Override annotation.
Cleanup: Move private helper method to section with private methods.