Rewrite query generation logic to explicitly name primary key fields.

Primary key aliases are no longer available as of CQL 3.