Small rearrangements to allow the use of Cam::Point as well as gp_Pnt in some locations.