gldp:PropertyListMode/gldp:TypeMode refactoring