Minor cleanup, mostly...

Although it may help me to nail down the final instance of unencrypted
data.