More improvements to support tie resolution in grassroots.