Realised there was no need for SelfClosingEvent - Barrier does exactly what I need...