Merge "zz_motion_search() cleanup."