CPGeometry.j and CGGeometry.j now share their implementation in two private API classes in the lower layer Foundation.