Preserve TableKeyString identifiers

Closes #17