Support Cassandra String based partition keys

Fix for #1518 and #1591
The `else` is not needed since the `if` block always returns.