Further cleanup of isEventSupported