Improve wrap bounds for drawing.