diff --git a/analyzer/testdata/src/extra/file.go b/analyzer/testdata/src/extra/file.go
index 57a7ceb9..77df7c6d 100644
--- a/analyzer/testdata/src/extra/file.go
+++ b/analyzer/testdata/src/extra/file.go
@@ -311,3 +311,21 @@ func testEmptyVarBlock() {
 	type ()  // want `\Qempty type() block`
 	const () // want `\Qempty const() block`
 }
+
+func testYodaExpr() {
+	var clusterContext struct {
+		PostInstallData struct {
+			CoreDNSUpdateFunction func()
+			AnotherNestedStruct   struct {
+				DeeplyNestedField *int
+			}
+		}
+	}
+
+	// This is on the boundary of being too long to be displayed in the CLI output.
+	if nil != clusterContext.PostInstallData.CoreDNSUpdateFunction { // want `\Qsuggestion: clusterContext.PostInstallData.CoreDNSUpdateFunction != nil`
+	}
+	// This is far too long, so it's shortened in the output.
+	if nil != clusterContext.PostInstallData.AnotherNestedStruct.DeeplyNestedField { // want `\Qsuggestion: $s != nil`
+	}
+}
diff --git a/analyzer/testdata/src/extra/rules.go b/analyzer/testdata/src/extra/rules.go
index 54c23843..73b9e482 100644
--- a/analyzer/testdata/src/extra/rules.go
+++ b/analyzer/testdata/src/extra/rules.go
@@ -135,4 +135,6 @@ func _(m fluent.Matcher) {
 
 	m.Match(`byte($x)`).Where(m["x"].Type.Is("byte")).Suggest(`$x`)
 	m.Match(`rune($x)`).Where(m["x"].Type.Is("rune")).Suggest(`$x`)
+
+	m.Match(`nil != $s`).Where(!m["s"].Const).Suggest(`$s != nil`)
 }
diff --git a/ruleguard/runner.go b/ruleguard/runner.go
index 6d1f0403..0b3f1e7b 100644
--- a/ruleguard/runner.go
+++ b/ruleguard/runner.go
@@ -145,7 +145,7 @@ func (rr *rulesRunner) handleMatch(rule goRule, m gogrep.MatchData) bool {
 	if rule.severity != "" {
 		prefix = rule.severity + ": "
 	}
-	message := prefix + rr.renderMessage(rule.msg, m.Node, m.Values)
+	message := prefix + rr.renderMessage(rule.msg, m.Node, m.Values, true)
 	node := m.Node
 	if rule.location != "" {
 		node = m.Values[rule.location]
@@ -153,7 +153,7 @@ func (rr *rulesRunner) handleMatch(rule goRule, m gogrep.MatchData) bool {
 	var suggestion *Suggestion
 	if rule.suggestion != "" {
 		suggestion = &Suggestion{
-			Replacement: []byte(rr.renderMessage(rule.suggestion, m.Node, m.Values)),
+			Replacement: []byte(rr.renderMessage(rule.suggestion, m.Node, m.Values, false)),
 			From:        node.Pos(),
 			To:          node.End(),
 		}
@@ -162,7 +162,7 @@ func (rr *rulesRunner) handleMatch(rule goRule, m gogrep.MatchData) bool {
 	return true
 }
 
-func (rr *rulesRunner) renderMessage(msg string, n ast.Node, nodes map[string]ast.Node) string {
+func (rr *rulesRunner) renderMessage(msg string, n ast.Node, nodes map[string]ast.Node, truncate bool) string {
 	var buf strings.Builder
 	if strings.Contains(msg, "$$") {
 		buf.Write(rr.nodeText(n))
@@ -180,7 +180,7 @@ func (rr *rulesRunner) renderMessage(msg string, n ast.Node, nodes map[string]as
 		buf.Write(rr.nodeText(n))
 		// Don't interpolate strings that are too long.
 		var replacement string
-		if buf.Len() > 40 {
+		if truncate && buf.Len() > 60 {
 			replacement = key
 		} else {
 			replacement = buf.String()