Cleanup the use of evented?
Merge pull request #54 from halorgium/cleanup-evented-checks

Cleanup the use of evented?