This version splits the previous change into two patches:
Patch 1 contains only a readability refactoring with no functional change.
Patch 2 contains the intentional tie-breaking behavior change.

This addresses the review feedback on separating functional changes
from code cleanups.

Signed-off-by: Zhan Xusheng <zhanxusheng@xiaomi.com>
-- 
2.43.0