Enforce key correctness

This one's pretty straightforward.