Remove unnecessary abstraction around rectangles