Need to deal with the case that $2 here is Nil if the encryption method is not explicit and this is the default encryption type. Blows up on my old data files. Probably need to add this to the test suite.