Some simplification based on the assumption that key storage shouldn't be highly configurable. No longer touches common/sexp-parse.h I'm sending this patch under CC-0 creative commons license. If I need to sign something and scan it, I can do that too.