Improved handling of file buffers and encryptors.