Removing a metric tonne of rubbish from the events specification; in forthcoming commits, seven events will be united into three.