More full-disk encryption work.