Damn, that's a lot of changes. How about we write some tests that ensure that nothing broke? Gotta make sure that we get all sorts of crazy bucket layouts in Cassandra and we get back on events. I can help with writing test cases. I should have wrote them when I committed this guy in the first place, sorry!