Regenerating SNS with new Map witnesses
Ensuring Flatten wrappers are correctly passed through for isos/constructors
Removing extraneous parens
Removing ToQuery Generics