Refactor how vertex and focus points are captured for polygons and discs respectively.