Bugfix: Decryption should assume PKCS7 padding; Cleanup of padding-related code during encryption