Further cleanup of isEventSupported
Merge pull request #780 from syranide/newhasevent

Further cleanup of isEventSupported