And fix caption grabber regexp.