Jeff, just trying to circle back here and get this right.  One of your Azure requests is to get rid of the attributes:

groupTypeMailEnabled : boolean

groupTypeMailEnabledSecurity : boolean

groupTypeSecurity : boolean

groupTypeUnified : boolean

mailEnabled : boolean

securityEnabled : boolean 

and just have a groupType attribute with these possible values right?

distributionGroup, security, securityMailEnabled, unified, unifiedSecurityEnabled 

and that groupType should be available in metadata on groups or folders?

Based on this matrix?
https://docs.microsoft.com/en-us/graph/api/resources/groups-overview?view=graph-rest-1.0