Improve zigzag gap fill. #1234