Replace some guess_head_span with def_span
#98519
+154
−223
Merged