diff --git a/internal/envutil/envfile.go b/internal/envutil/envfile.go
index 035d3263d..c9cc1f14f 100644
--- a/internal/envutil/envfile.go
+++ b/internal/envutil/envfile.go
@@ -36,13 +36,13 @@ func LoadEnvFile(path string) error {
 		}
 
 		// Parse KEY=VALUE
-		parts := strings.SplitN(line, "=", 2)
-		if len(parts) != 2 {
+		key, value, ok := strings.Cut(line, "=")
+		if !ok {
 			continue
 		}
 
-		key := strings.TrimSpace(parts[0])
-		value := strings.TrimSpace(parts[1])
+		key = strings.TrimSpace(key)
+		value = strings.TrimSpace(value)
 
 		// Expand $VAR references in value
 		value = os.ExpandEnv(value)
diff --git a/internal/logger/logger.go b/internal/logger/logger.go
index 3cf0ebeed..d376b5c72 100644
--- a/internal/logger/logger.go
+++ b/internal/logger/logger.go
@@ -208,10 +208,7 @@ func matchPattern(namespace, pattern string) bool {
 			return strings.HasSuffix(namespace, suffix)
 		}
 		// Middle wildcard: split and check both parts
-		parts := strings.SplitN(pattern, "*", 2)
-		if len(parts) == 2 {
-			prefix := parts[0]
-			suffix := parts[1]
+		if prefix, suffix, ok := strings.Cut(pattern, "*"); ok {
 			return strings.HasPrefix(namespace, prefix) && strings.HasSuffix(namespace, suffix)
 		}
 	}
diff --git a/internal/sanitize/sanitize.go b/internal/sanitize/sanitize.go
index 51363eec9..a84eb6e40 100644
--- a/internal/sanitize/sanitize.go
+++ b/internal/sanitize/sanitize.go
@@ -167,17 +167,15 @@ func SanitizeArgs(args []string) []string {
 	for i := 0; i < len(args); i++ {
 		arg := args[i]
 
-		// Check if this is an environment variable value after a -e flag
+		// Check if this is an environment variable value after a -e flag.
 		// Format: -e VAR=VALUE
-		if i > 0 && args[i-1] == "-e" && strings.Contains(arg, "=") {
-			// Split on first = to get VAR and VALUE.
-			// strings.SplitN with n=2 always returns exactly 2 parts when "=" is present.
-			parts := strings.SplitN(arg, "=", 2)
-			sanitized[i] = parts[0] + "=" + TruncateSecret(parts[1])
-		} else {
-			// Pass through unchanged
-			sanitized[i] = arg
+		if i > 0 && args[i-1] == "-e" {
+			if varName, varValue, ok := strings.Cut(arg, "="); ok {
+				sanitized[i] = varName + "=" + TruncateSecret(varValue)
+				continue
+			}
 		}
+		sanitized[i] = arg
 	}
 	return sanitized
 }