Maid 403 Refactoring Flushing

These changes seem small, but it helps make future encapsulation changes more clear. The encapsulation changes are being made to ensure that the SelfEncryptor is protected while closing, and that flushing results in a new self encryptor.