I'm currently working on switching the server over from using the wire-format events inside the event generation/processing cycle to use custom structs, only visible inside the server. More on that later, but here's a couple of cleanup patches that can go into master already. Cheers, Peter