This is a step towards implementing CHK decryption and probably a better factoring of the encryption implementation.
This is stacked on !12 (merged)