Rename --nodecrypt to --no-decrypt and cleanup code.