Success! The storage key encryption feature has been implemented and the
code involved, refactored.