diff --git a/src/NetVar.cc b/src/NetVar.cc
index 245e7e43ef..74cc7ca2df 100644
--- a/src/NetVar.cc
+++ b/src/NetVar.cc
@@ -85,14 +85,6 @@ bool udp_content_delivery_ports_use_resp;
 double dns_session_timeout;
 double rpc_timeout;
 
-ListVal* skip_authentication;
-ListVal* direct_login_prompts;
-ListVal* login_prompts;
-ListVal* login_non_failure_msgs;
-ListVal* login_failure_msgs;
-ListVal* login_success_msgs;
-ListVal* login_timeouts;
-
 int mime_segment_length;
 int mime_segment_overlap_length;
 RecordType* mime_header_rec;
@@ -339,14 +331,6 @@ void init_net_var()
 
 	max_timer_expires = opt_internal_int("max_timer_expires");
 
-	skip_authentication = internal_list_val("skip_authentication");
-	direct_login_prompts = internal_list_val("direct_login_prompts");
-	login_prompts = internal_list_val("login_prompts");
-	login_non_failure_msgs = internal_list_val("login_non_failure_msgs");
-	login_failure_msgs = internal_list_val("login_failure_msgs");
-	login_success_msgs = internal_list_val("login_success_msgs");
-	login_timeouts = internal_list_val("login_timeouts");
-
 	mime_segment_length = opt_internal_int("mime_segment_length");
 	mime_segment_overlap_length = opt_internal_int("mime_segment_overlap_length");
 	mime_header_rec = lookup_type("mime_header_rec")->AsRecordType();
diff --git a/src/NetVar.h b/src/NetVar.h
index 07b1b92f10..fa76529197 100644
--- a/src/NetVar.h
+++ b/src/NetVar.h
@@ -83,14 +83,6 @@ extern bool udp_content_delivery_ports_use_resp;
 extern double dns_session_timeout;
 extern double rpc_timeout;
 
-extern ListVal* skip_authentication;
-extern ListVal* direct_login_prompts;
-extern ListVal* login_prompts;
-extern ListVal* login_non_failure_msgs;
-extern ListVal* login_failure_msgs;
-extern ListVal* login_success_msgs;
-extern ListVal* login_timeouts;
-
 extern int mime_segment_length;
 extern int mime_segment_overlap_length;
 extern RecordType* mime_header_rec;
diff --git a/src/Var.h b/src/Var.h
index 268445f9c3..0d495f92b4 100644
--- a/src/Var.h
+++ b/src/Var.h
@@ -54,6 +54,8 @@ extern bro_int_t opt_internal_int(const char* name);
 extern bro_uint_t opt_internal_unsigned(const char* name);
 extern StringVal* opt_internal_string(const char* name);
 extern TableVal* opt_internal_table(const char* name);	// nil if not defined
+
+[[deprecated("Remove in v4.1.  Use lookup_ID(), zeek::lookup_val(), and/or TableVal::ToPureListVal().")]]
 extern ListVal* internal_list_val(const char* name);
 
 [[deprecated("Remove in v4.1.  Use zeek::lookup_type().")]]
diff --git a/src/analyzer/protocol/login/Login.cc b/src/analyzer/protocol/login/Login.cc
index a2bff4e67d..4339c97fc4 100644
--- a/src/analyzer/protocol/login/Login.cc
+++ b/src/analyzer/protocol/login/Login.cc
@@ -11,6 +11,7 @@
 #include "RE.h"
 #include "Reporter.h"
 #include "Event.h"
+#include "Var.h"
 
 #include "events.bif.h"
 
@@ -44,16 +45,24 @@ Login_Analyzer::Login_Analyzer(const char* name, Connection* conn)
 
 	if ( ! re_skip_authentication )
 		{
+		IntrusivePtr<ListVal> skip_authentication = zeek::lookup_val("skip_authentication")->AsTableVal()->ToPureListVal();
+		IntrusivePtr<ListVal> direct_login_prompts = zeek::lookup_val("direct_login_prompts")->AsTableVal()->ToPureListVal();
+		IntrusivePtr<ListVal> login_prompts = zeek::lookup_val("login_prompts")->AsTableVal()->ToPureListVal();
+		IntrusivePtr<ListVal> login_non_failure_msgs = zeek::lookup_val("login_non_failure_msgs")->AsTableVal()->ToPureListVal();
+		IntrusivePtr<ListVal> login_failure_msgs = zeek::lookup_val("login_failure_msgs")->AsTableVal()->ToPureListVal();
+		IntrusivePtr<ListVal> login_success_msgs = zeek::lookup_val("login_success_msgs")->AsTableVal()->ToPureListVal();
+		IntrusivePtr<ListVal> login_timeouts = zeek::lookup_val("login_timeouts")->AsTableVal()->ToPureListVal();
+
 #ifdef USE_PERFTOOLS_DEBUG
 		HeapLeakChecker::Disabler disabler;
 #endif
-		re_skip_authentication = init_RE(skip_authentication);
-		re_direct_login_prompts = init_RE(direct_login_prompts);
-		re_login_prompts = init_RE(login_prompts);
-		re_login_non_failure_msgs = init_RE(login_non_failure_msgs);
-		re_login_failure_msgs = init_RE(login_failure_msgs);
-		re_login_success_msgs = init_RE(login_success_msgs);
-		re_login_timeouts = init_RE(login_timeouts);
+		re_skip_authentication = init_RE(skip_authentication.get());
+		re_direct_login_prompts = init_RE(direct_login_prompts.get());
+		re_login_prompts = init_RE(login_prompts.get());
+		re_login_non_failure_msgs = init_RE(login_non_failure_msgs.get());
+		re_login_failure_msgs = init_RE(login_failure_msgs.get());
+		re_login_success_msgs = init_RE(login_success_msgs.get());
+		re_login_timeouts = init_RE(login_timeouts.get());
 		}
 	}