Moved on-* matching into selector.
EventHandler triggers eval instead of apply