-extern uschar *deliver_localpart; /* The local part for delivery */
-extern uschar *deliver_localpart_data; /* From local part lookup */
-extern uschar *deliver_localpart_orig; /* The original local part for delivery */
-extern uschar *deliver_localpart_parent; /* The parent local part for delivery */
-extern uschar *deliver_localpart_prefix; /* The stripped prefix, if any */
-extern uschar *deliver_localpart_suffix; /* The stripped suffix, if any */
+extern const uschar *deliver_localpart;/* The local part for delivery */
+extern uschar *deliver_localpart_data; /* From local part lookup (de-tainted) */
+extern const uschar *deliver_localpart_orig; /* The original local part for delivery */
+extern const uschar *deliver_localpart_parent; /* The parent local part for delivery */
+extern const uschar *deliver_localpart_prefix; /* The stripped prefix, if any */
+extern const uschar *deliver_localpart_prefix_v; /* The stripped-prefix variable portion, if any */
+extern const uschar *deliver_localpart_suffix; /* The stripped suffix, if any */
+extern const uschar *deliver_localpart_suffix_v; /* The stripped-suffix variable portion, if any */