-#define hv_fetch_ent(zlonk, awk, touche, zgruppp) \
- ((HE *) hv_common((zlonk), (awk), NULL, 0, 0, \
- ((touche) ? HV_FETCH_LVALUE : 0), NULL, (zgruppp)))
-#define hv_delete_ent(zlonk, awk, touche, zgruppp) \
- ((SV *) hv_common((zlonk), (awk), NULL, 0, 0, (touche) | HV_DELETE, \
- NULL, (zgruppp)))
-
-#define hv_store_flags(urkk, zamm, clunk, thwape, sploosh, eee_yow) \
- ((SV**) hv_common((urkk), NULL, (zamm), (clunk), (eee_yow), \
- (HV_FETCH_ISSTORE|HV_FETCH_JUST_SV), (thwape), \
- (sploosh)))
-
-#define hv_store(urkk, zamm, clunk, thwape, sploosh) \
- ((SV**) hv_common_key_len((urkk), (zamm), (clunk), \
+#define hv_fetch_ent(hv, keysv, lval, hash) \
+ ((HE *) hv_common((hv), (keysv), NULL, 0, 0, \
+ ((lval) ? HV_FETCH_LVALUE : 0), NULL, (hash)))
+#define hv_delete_ent(hv, key, flags, hash) \
+ (MUTABLE_SV(hv_common((hv), (key), NULL, 0, 0, (flags) | HV_DELETE, \
+ NULL, (hash))))
+
+#define hv_store_flags(hv, key, klen, val, hash, flags) \
+ ((SV**) hv_common((hv), NULL, (key), (klen), (flags), \
+ (HV_FETCH_ISSTORE|HV_FETCH_JUST_SV), (val), \
+ (hash)))
+
+#define hv_store(hv, key, klen, val, hash) \
+ ((SV**) hv_common_key_len((hv), (key), (klen), \