attempted smartening up find-and-mark-incomplete; still not quite right