Complete AbstractShape/Rect decoupling.