Continued rewrite of GeometryPoint functions.