Streamline simple- and full-key code

[jnga]

Streamline the code for the simple and full keys for easier maintenance in the future.

(This could also include any build steps, modules, frameworks, and so on.)