Be more aggressive in finding solid rectangles

The previous FIXME was incorrect. The old code did in fact continue
looking over the entire area. This commit restores that old behaviour.
2 files changed