Replace data-default with data-default-generics
Add extended defaulting (for GlibString)