-#define SCM_INITIAL_MCACHE_SIZE 1
-
-#define scm_si_methods 0 /* offset of methods slot in a <generic> */
-#define scm_si_n_specialized 1
-#define scm_si_cache_mutex 2
-#define scm_si_extended_by 3
-#define scm_si_generic_cache 4
-#define scm_si_dispatch_procedure 5
-#define scm_si_effective_methods 6
-#define scm_si_generic_setter 7
+#define scm_si_dispatch_procedure scm_applicable_struct_index_procedure /* 0 */
+#define scm_si_methods 1
+#define scm_si_n_specialized 2
+#define scm_si_extended_by 3
+#define scm_si_effective_methods 4
+#define scm_si_generic_setter 5