Siemens-s7 format: Trivial improvements, and separate key setup from salts.
This made a 30-40% boost.