diff --git a/src/net/dial_test.go b/src/net/dial_test.go
index 07a9b46ddb69ef..7ddf8b9882c0e6 100644
--- a/src/net/dial_test.go
+++ b/src/net/dial_test.go
@@ -1088,14 +1088,16 @@ func TestDialContext(t *testing.T) {
 			var c Conn
 			switch network {
 			case "tcp", "tcp4", "tcp6":
-				raddr, err := netip.ParseAddrPort(ln.Addr().String())
+				var raddr netip.AddrPort
+				raddr, err = netip.ParseAddrPort(ln.Addr().String())
 				if err != nil {
 					t.Error(err)
 					continue
 				}
 				c, err = d.DialTCP(context.WithValue(context.Background(), "id", i+1), network, (*TCPAddr)(nil).AddrPort(), raddr)
 			case "unix", "unixpacket":
-				raddr, err := ResolveUnixAddr(network, ln.Addr().String())
+				var raddr *UnixAddr
+				raddr, err = ResolveUnixAddr(network, ln.Addr().String())
 				if err != nil {
 					t.Error(err)
 					continue
@@ -1131,14 +1133,16 @@ func TestDialContext(t *testing.T) {
 			var c2 Conn
 			switch network {
 			case "udp", "udp4", "udp6":
-				raddr, err := netip.ParseAddrPort(c1.LocalAddr().String())
+				var raddr netip.AddrPort
+				raddr, err = netip.ParseAddrPort(c1.LocalAddr().String())
 				if err != nil {
 					t.Error(err)
 					continue
 				}
 				c2, err = d.DialUDP(context.WithValue(context.Background(), "id", i+1), network, (*UDPAddr)(nil).AddrPort(), raddr)
 			case "unixgram":
-				raddr, err := ResolveUnixAddr(network, c1.LocalAddr().String())
+				var raddr *UnixAddr
+				raddr, err = ResolveUnixAddr(network, c1.LocalAddr().String())
 				if err != nil {
 					t.Error(err)
 					continue
diff --git a/src/net/dnsclient_unix.go b/src/net/dnsclient_unix.go
index 40f76062944f46..bf0456ba26cd1b 100644
--- a/src/net/dnsclient_unix.go
+++ b/src/net/dnsclient_unix.go
@@ -495,9 +495,8 @@ func avoidDNS(name string) bool {
 // nameList returns a list of names for sequential DNS queries.
 func (conf *dnsConfig) nameList(name string) []string {
 	// Check name length (see isDomainName).
-	l := len(name)
-	rooted := l > 0 && name[l-1] == '.'
-	if l > 254 || l == 254 && !rooted {
+	rooted := len(name) > 0 && name[len(name)-1] == '.'
+	if len(name) > 254 || len(name) == 254 && !rooted {
 		return nil
 	}
 
@@ -511,7 +510,6 @@ func (conf *dnsConfig) nameList(name string) []string {
 
 	hasNdots := bytealg.CountString(name, '.') >= conf.ndots
 	name += "."
-	l++
 
 	// Build list of search choices.
 	names := make([]string, 0, 1+len(conf.search))