Refined overall geometry.
Further refinement.