Removing the typedefs makes it so much more straightforward to forward declare the various disruptor types