Merge pull request #789 from spicyj/gh-785

Set target properties explicitly for enter/leave
Set event type on enter/leave events

Fixes #444.