Add GeometryAttributes
Remove old Obj-C types, fix Geometry