Yes, best left until the event declarations are more settled as that may affect this code too.