better-defined PointId typedef and clean up of aftermath