Make keys 1-tuple structs.

Hurray type safety.