diff --git a/src/modules/_Crypto/cbc.c b/src/modules/_Crypto/cbc.c
index 6cb8e460e0eeacb2a413c15202c527c99deda60d..b2d160f5cc4e6a547b69ed84f700c8881cdae6bc 100644
--- a/src/modules/_Crypto/cbc.c
+++ b/src/modules/_Crypto/cbc.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cbc.c,v 1.3 1997/02/11 17:34:58 nisse Exp $
+ * $Id: cbc.c,v 1.4 1997/02/12 06:09:54 nisse Exp $
  *
  * CBC (Cipher Block Chaining Mode) crypto module for Pike.
  *
@@ -297,11 +297,6 @@ static void f_crypt_block(INT32 args)
  * Module linkage
  */
 
-void MOD_INIT2(cbc)(void)
-{
-  /* add_efun()s */
-}
-
 void MOD_INIT(cbc)(void)
 {
   /*
@@ -339,13 +334,10 @@ void MOD_INIT(cbc)(void)
   set_init_callback(init_pike_crypto_cbc);
   set_exit_callback(exit_pike_crypto_cbc);
 
-  pike_crypto_cbc_program = end_c_program(MODULE_PREFIX "cbc");
-  pike_crypto_cbc_program->refs++;
+  end_class(MODULE_PREFIX "cbc", 0);
 }
 
 void MOD_EXIT(cbc)(void)
 {
-  /* free_program()s */
-  free_program(pike_crypto_cbc_program);
 }
 
diff --git a/src/modules/_Crypto/crypto.c b/src/modules/_Crypto/crypto.c
index 4d7b242371ec11f09482e1b3ba6a22c440713189..de5934aed3632142ba080ace90221e6fce2b18ee 100644
--- a/src/modules/_Crypto/crypto.c
+++ b/src/modules/_Crypto/crypto.c
@@ -1,5 +1,5 @@
 /*
- * $Id: crypto.c,v 1.11 1997/02/11 17:35:16 nisse Exp $
+ * $Id: crypto.c,v 1.12 1997/02/12 06:10:04 nisse Exp $
  *
  * A pike module for getting access to some common cryptos.
  *
@@ -422,13 +422,11 @@ static void f_unpad(INT32 args)
  * Module linkage
  */
 
+#if 0
 void MOD_INIT2(crypto)(void)
 {
   /* add_efun()s */
 
-  add_efun("string_to_hex", f_string_to_hex, "function(string:string)", OPT_TRY_OPTIMIZE);
-  add_efun("hex_to_string", f_hex_to_string, "function(string:string)", OPT_TRY_OPTIMIZE);
-
 #if 0
   MOD_INIT2(md2)();
   MOD_INIT2(md5)();
@@ -443,6 +441,7 @@ void MOD_INIT2(crypto)(void)
   MOD_INIT2(pipe)();
 #endif
 }
+#endif
 
 void MOD_INIT(crypto)(void)
 {
@@ -462,7 +461,7 @@ void MOD_INIT(crypto)(void)
    * program->refs++;
    *
    */
-
+  
   start_new_program();
   add_storage(sizeof(struct pike_crypto));
 
@@ -481,13 +480,21 @@ void MOD_INIT(crypto)(void)
   set_init_callback(init_pike_crypto);
   set_exit_callback(exit_pike_crypto);
 
-  pike_crypto_program = end_c_program(MODULE_PREFIX "crypto");
-  pike_crypto_program->refs++;
+  end_class(MODULE_PREFIX "crypto", 0);
+}
+
+void MOD_EXIT(crypto)(void) {}
+
+void pike_module_init(void)
+{
+  add_efun("string_to_hex", f_string_to_hex, "function(string:string)", OPT_TRY_OPTIMIZE);
+  add_efun("hex_to_string", f_hex_to_string, "function(string:string)", OPT_TRY_OPTIMIZE);
 #if 0
   MOD_INIT(md2)();
   MOD_INIT(md5)();
 #endif
 #if 1
+  MOD_INIT(crypto)();
   MOD_INIT(idea)();
   MOD_INIT(des)();
   MOD_INIT(invert)();
@@ -496,9 +503,9 @@ void MOD_INIT(crypto)(void)
   MOD_INIT(cbc)();
   MOD_INIT(pipe)();
 #endif
-}
+}  
 
-void MOD_EXIT(crypto)(void)
+void pike_module_exit(void)
 {
   /* free_program()s */
 #if 0
@@ -506,6 +513,7 @@ void MOD_EXIT(crypto)(void)
   MOD_EXIT(md5)();
 #endif
 #if 1
+  MOD_EXIT(crypto)();
   MOD_EXIT(idea)();
   MOD_EXIT(des)();
   MOD_EXIT(invert)();
diff --git a/src/modules/_Crypto/des.c b/src/modules/_Crypto/des.c
index dfdbf79ef633daba52d5c9545e7542b554471d30..dbc70984569bb4a3a715e3daafece544ed863023 100644
--- a/src/modules/_Crypto/des.c
+++ b/src/modules/_Crypto/des.c
@@ -1,5 +1,5 @@
 /*
- * $Id: des.c,v 1.4 1997/01/14 18:28:00 nisse Exp $
+ * $Id: des.c,v 1.5 1997/02/12 06:10:10 nisse Exp $
  *
  * A pike module for getting access to some common cryptos.
  *
@@ -107,7 +107,7 @@ static void set_key(INT32 args)
   }
   if (sp[-1].u.string->len != 8)
     error("Invalid key length to des->set_key()\n");
-  switch (DesMethod(&(THIS->method), sp[-1].u.string->str))
+  switch (DesMethod(THIS->method, sp[-1].u.string->str))
     {
     case -1:
       error("des->set_key: parity error\n");
@@ -294,7 +294,7 @@ static void f_crypt_block(INT32 args)
 {
   unsigned len;
   struct pike_string *s;
-  INT32 i;
+  unsigned INT32 i;
   
   if (args != 1) {
     error("Wrong number of arguments to des->crypt_block()\n");
@@ -334,10 +334,12 @@ static void f_dump(INT32 args)
  * Module linkage
  */
 
+#if 0
 void MOD_INIT2(des)(void)
 {
   /* add_efun()s */
 }
+#endif
 
 void MOD_INIT(des)(void)
 {
@@ -383,12 +385,9 @@ void MOD_INIT(des)(void)
   set_init_callback(init_pike_crypto_des);
   set_exit_callback(exit_pike_crypto_des);
 
-  pike_crypto_des_program = end_c_program(MODULE_PREFIX "des");
-  pike_crypto_des_program->refs++;
+  end_class(MODULE_PREFIX "des", 0);
 }
 
 void MOD_EXIT(des)(void)
 {
-  /* free_program()s */
-  free_program(pike_crypto_des_program);
 }
diff --git a/src/modules/_Crypto/idea.c b/src/modules/_Crypto/idea.c
index c923594792c9d7e471e6b26d7ad71039a1508a53..eed4aa31dc7210d64fb545bff38d761b363d2c1c 100644
--- a/src/modules/_Crypto/idea.c
+++ b/src/modules/_Crypto/idea.c
@@ -1,5 +1,5 @@
 /*
- * $Id: idea.c,v 1.7 1997/02/11 17:36:51 nisse Exp $
+ * $Id: idea.c,v 1.8 1997/02/12 06:10:15 nisse Exp $
  *
  * IDEA crypto module for Pike
  *
@@ -141,10 +141,12 @@ static void f_crypt_block(INT32 args)
  * Module linkage
  */
 
+#if 0
 void MOD_INIT2(idea)(void)
 {
   /* add_efun()s */
 }
+#endif
 
 void MOD_INIT(idea)(void)
 {
@@ -165,7 +167,6 @@ void MOD_INIT(idea)(void)
    *
    */
 
-  /* /precompiled/crypto/idea */
   start_new_program();
   add_storage(sizeof(INT16[IDEA_KEYLEN]));
 
@@ -179,12 +180,9 @@ void MOD_INIT(idea)(void)
   set_init_callback(init_pike_crypto_idea);
   set_exit_callback(exit_pike_crypto_idea);
 
-  pike_crypto_idea_program = end_c_program(MODULE_PREFIX "idea");
-  pike_crypto_idea_program->refs++;
+  end_class(MODULE_PREFIX "idea", 0);
 }
 
 void MOD_EXIT(idea)(void)
 {
-  /* free_program()s */
-  free_program(pike_crypto_idea_program);
 }
diff --git a/src/modules/_Crypto/invert.c b/src/modules/_Crypto/invert.c
index fd00fed8534b2f58ac0ece780ec57e5e6ca12172..0998603d9000e3e6b1b5bd264a14a66ee6cbe402 100644
--- a/src/modules/_Crypto/invert.c
+++ b/src/modules/_Crypto/invert.c
@@ -1,5 +1,5 @@
 /*
- * $Id: invert.c,v 1.3 1997/01/14 18:28:40 nisse Exp $
+ * $Id: invert.c,v 1.4 1997/02/12 06:10:18 nisse Exp $
  *
  * INVERT crypto module for Pike
  *
@@ -126,11 +126,6 @@ static void f_crypt_block(INT32 args)
  * Module linkage
  */
 
-void MOD_INIT2(invert)(void)
-{
-  /* add_efun()s */
-}
-
 void MOD_INIT(invert)(void)
 {
   /*
@@ -163,14 +158,11 @@ void MOD_INIT(invert)(void)
   set_init_callback(init_pike_crypto_invert);
   set_exit_callback(exit_pike_crypto_invert);
 
-  pike_crypto_invert_program = end_c_program(MODULE_PREFIX "invert");
-  pike_crypto_invert_program->refs++;
+  end_class(MODULE_PREFIX "invert", 0);
 }
 
 void MOD_EXIT(invert)(void)
 {
-  /* free_program()s */
-  free_program(pike_crypto_invert_program);
 }
 
 
diff --git a/src/modules/_Crypto/pipe.c b/src/modules/_Crypto/pipe.c
index d2b1b254dd97d61adaba49ed5831f560acec0e52..30fc34bf4a80b5f372d5630ecf01c87e698cc59e 100644
--- a/src/modules/_Crypto/pipe.c
+++ b/src/modules/_Crypto/pipe.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pipe.c,v 1.3 1997/01/14 18:28:56 nisse Exp $
+ * $Id: pipe.c,v 1.4 1997/02/12 06:10:23 nisse Exp $
  *
  * PIPE crypto module for Pike.
  *
@@ -269,11 +269,6 @@ static void f_crypt_block(INT32 args)
  * Module linkage
  */
 
-void init_crypto_pipe_efuns(void)
-{
-  /* add_efun()s */
-}
-
 void MOD_INIT(pipe)(void)
 {
   /*
@@ -309,12 +304,9 @@ void MOD_INIT(pipe)(void)
   set_init_callback(init_pike_crypto_pipe);
   set_exit_callback(exit_pike_crypto_pipe);
 
-  pike_crypto_pipe_program = end_c_program(MODULE_PREFIX "pipe");
-  pike_crypto_pipe_program->refs++;
+  end_class(MODULE_PREFIX "pipe", 0);
 }
 
 void MOD_EXIT(pipe)(void)
 {
-  /* free_program()s */
-  free_program(pike_crypto_pipe_program);
 }
diff --git a/src/modules/_Crypto/rc4.c b/src/modules/_Crypto/rc4.c
index 457e159a323db3df7979645edde7b65803482a51..5f6257ef80c32365c6f42183cae33d299b297848 100644
--- a/src/modules/_Crypto/rc4.c
+++ b/src/modules/_Crypto/rc4.c
@@ -112,14 +112,11 @@ void MOD_INIT(rc4)(void)
   set_init_callback(init_pike_rc4);
   set_exit_callback(exit_pike_rc4);
 
-  pike_rc4_program = end_c_program(MODULE_PREFIX "rc4");
-  pike_rc4_program->refs++;
+  end_class(MODULE_PREFIX "rc4", 0);
 }
 
 void MOD_EXIT(rc4)(void)
 {
-  /* free_program()s */
-  free_program(pike_rc4_program);
 }
 
 
diff --git a/src/modules/_Crypto/sha.c b/src/modules/_Crypto/sha.c
index 2c604df5970ba938e8f9570c5de3f60e8abd6411..28e1c699c63d49738c7bfa69b3b5a0891ce47c36 100644
--- a/src/modules/_Crypto/sha.c
+++ b/src/modules/_Crypto/sha.c
@@ -57,10 +57,8 @@ static void shamod_digest(INT32 args)
   push_string(end_shared_string(s));
 }
 
-void MOD_INIT2(sha)(void) {}
 void MOD_EXIT(sha)(void)
 {
-  free_program(shamod_program);
 }
 
 void MOD_INIT(sha)(void)
@@ -70,6 +68,5 @@ void MOD_INIT(sha)(void)
   add_function("create", shamod_create, "function(void|object:void)", 0);
   add_function("update", shamod_update, "function(string:void)", 0);
   add_function("digest", shamod_digest, "function(void:string)", 0);
-  shamod_program = end_c_program(MODULE_PREFIX "sha");
-  shamod_program->refs++;
+  end_class(MODULE_PREFIX "sha", 0);
 }