Also to be clear, I'm pretty unhappy with the current CQL solution too.  :(