Further LineSearch cleanup.