I removed these defs from Geometry set and moved them into the individual types. We can abstract them out and add back later if needed.