Minor improvements to CipherStream init process.