Follow up r60742, r60743, r60764, r60766, r61214, r61390. Split stripForSearch into...