Merge "Tweak one hint and one split in the linear scan."