Fix shadowed variable declaration
Explicitly initialize event queue in ctor init args
Move readerwriterqueue back to master