revert a bunch of stuff related to what I imagined about CQL collection types (they are just composites from thrift it seems...)