limit line length to 100 characters.

62 files changed, 747 insertions, 418 deletions

diff --git a/HACKING b/HACKING
index cff9f485..ebb5a116 100644
--- a/HACKING
+++ b/HACKING
@@ -51,6 +51,8 @@ Coding Style
            message(G_LOG_LEVEL_MESSAGE, "Ok");
          }
 
+- Limit line length to at most 100 characters.
+
 - Check for memory leaks.
   I recommend valgrind (http://valgrind.kde.org) utility with options:
     --leak-check=yes
diff --git a/lasso/id-ff/defederation.h b/lasso/id-ff/defederation.h
index 6abdf4bb..6c8449ce 100644
--- a/lasso/id-ff/defederation.h
+++ b/lasso/id-ff/defederation.h
@@ -15,12 +15,12 @@
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #ifndef __LASSO_DEFEDERATION_H__
@@ -34,11 +34,15 @@ extern "C" {
 #include <lasso/xml/lib_federation_termination_notification.h>
 
 #define LASSO_TYPE_DEFEDERATION (lasso_defederation_get_type())
-#define LASSO_DEFEDERATION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_DEFEDERATION, LassoDefederation))
-#define LASSO_DEFEDERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_DEFEDERATION, LassoDefederationClass))
+#define LASSO_DEFEDERATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_DEFEDERATION, LassoDefederation))
+#define LASSO_DEFEDERATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_DEFEDERATION, LassoDefederationClass))
 #define LASSO_IS_DEFEDERATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_DEFEDERATION))
-#define LASSO_IS_DEFEDERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_DEFEDERATION))
-#define LASSO_DEFEDERATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_DEFEDERATION, LassoDefederationClass)) 
+#define LASSO_IS_DEFEDERATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_DEFEDERATION))
+#define LASSO_DEFEDERATION_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_DEFEDERATION, LassoDefederationClass)) 
 
 typedef struct _LassoDefederation LassoDefederation;
 typedef struct _LassoDefederationClass LassoDefederationClass;
@@ -53,24 +57,22 @@ struct _LassoDefederationClass {
 	LassoProfileClass parent;
 };
 
-LASSO_EXPORT GType              lasso_defederation_get_type (void);
+LASSO_EXPORT GType lasso_defederation_get_type(void);
 
-LASSO_EXPORT LassoDefederation *lasso_defederation_new      (LassoServer       *server);
-  
+LASSO_EXPORT LassoDefederation *lasso_defederation_new(LassoServer *server);
+ 
 
-LASSO_EXPORT gint lasso_defederation_build_notification_msg   (LassoDefederation *defederation);
+LASSO_EXPORT gint lasso_defederation_build_notification_msg(LassoDefederation *defederation);
 
-LASSO_EXPORT void lasso_defederation_destroy                  (LassoDefederation *defederation);
+LASSO_EXPORT void lasso_defederation_destroy(LassoDefederation *defederation);
 
-LASSO_EXPORT gint lasso_defederation_init_notification        (LassoDefederation *defederation,
-							       gchar             *remote_providerID,
-							       lassoHttpMethod    notification_method);
-
-LASSO_EXPORT gint lasso_defederation_process_notification_msg (LassoDefederation *defederation,
-							       gchar             *notification_msg);
-  
-LASSO_EXPORT gint lasso_defederation_validate_notification    (LassoDefederation *defederation);
+LASSO_EXPORT gint lasso_defederation_init_notification(LassoDefederation *defederation,
+		gchar *remote_providerID, lassoHttpMethod notification_method);
 
+LASSO_EXPORT gint lasso_defederation_process_notification_msg(
+		LassoDefederation *defederation, gchar *notification_msg);
+ 
+LASSO_EXPORT gint lasso_defederation_validate_notification(LassoDefederation *defederation);
 
 
 #ifdef __cplusplus
diff --git a/lasso/id-ff/federation.h b/lasso/id-ff/federation.h
index dad9295a..1b8d51fa 100644
--- a/lasso/id-ff/federation.h
+++ b/lasso/id-ff/federation.h
@@ -34,11 +34,15 @@ extern "C" {
 #include <lasso/xml/saml_name_identifier.h>
 
 #define LASSO_TYPE_FEDERATION (lasso_federation_get_type())
-#define LASSO_FEDERATION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_FEDERATION, LassoFederation))
-#define LASSO_FEDERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_FEDERATION, LassoFederationClass))
+#define LASSO_FEDERATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_FEDERATION, LassoFederation))
+#define LASSO_FEDERATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_FEDERATION, LassoFederationClass))
 #define LASSO_IS_FEDERATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_FEDERATION))
-#define LASSO_IS_FEDERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_FEDERATION))
-#define LASSO_FEDERATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_FEDERATION, LassoFederationClass)) 
+#define LASSO_IS_FEDERATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_FEDERATION))
+#define LASSO_FEDERATION_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_FEDERATION, LassoFederationClass)) 
 
 typedef struct _LassoFederation LassoFederation;
 typedef struct _LassoFederationClass LassoFederationClass;
diff --git a/lasso/id-ff/identity.h b/lasso/id-ff/identity.h
index fe2f594a..e5bff7c4 100644
--- a/lasso/id-ff/identity.h
+++ b/lasso/id-ff/identity.h
@@ -35,10 +35,12 @@ extern "C" {
 
 #define LASSO_TYPE_IDENTITY (lasso_identity_get_type())
 #define LASSO_IDENTITY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDENTITY, LassoIdentity))
-#define LASSO_IDENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDENTITY, LassoIdentityClass))
+#define LASSO_IDENTITY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDENTITY, LassoIdentityClass))
 #define LASSO_IS_IDENTITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDENTITY))
 #define LASSO_IS_IDENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDENTITY))
-#define LASSO_IDENTITY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDENTITY, LassoIdentityClass)) 
+#define LASSO_IDENTITY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDENTITY, LassoIdentityClass)) 
 
 typedef struct _LassoIdentity LassoIdentity;
 typedef struct _LassoIdentityClass LassoIdentityClass;
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index ba88736f..053c49bb 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -6,7 +6,7 @@
  * http://lasso.entrouvert.org
  * 
  * Authors: Nicolas Clapies <nclapies@entrouvert.com>
- * Valery Febvre <vfebvre@easter-eggs.com>
+ *          Valery Febvre <vfebvre@easter-eggs.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -128,7 +128,8 @@ lasso_login_build_assertion(LassoLogin *login,
 
 	if (login->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_POST) {
 		/* only add assertion if response is an AuthnResponse */
-		LASSO_SAMLP_RESPONSE(profile->response)->Assertion = LASSO_SAML_ASSERTION(assertion);
+		LASSO_SAMLP_RESPONSE(profile->response)->Assertion = 
+			LASSO_SAML_ASSERTION(assertion);
 	}
 	/* store assertion in session object */
 	if (profile->session == NULL) {
@@ -346,7 +347,8 @@ lasso_login_process_response_status_and_assertion(LassoLogin *login)
 
 		/* store NameIdentifier */
 		profile->nameIdentifier = LASSO_SAML_SUBJECT_STATEMENT_ABSTRACT(
-				response->Assertion->AuthenticationStatement)->Subject->NameIdentifier->content;
+				response->Assertion->AuthenticationStatement
+				)->Subject->NameIdentifier->content;
 
 		if (LASSO_PROFILE(login)->nameIdentifier == NULL)
 			return LASSO_ERROR_UNDEFINED;
@@ -399,7 +401,8 @@ lasso_login_accept_sso(LassoLogin *login)
 	lasso_session_add_assertion(profile->session, profile->remote_providerID, assertion);
 
 	authentication_statement = LASSO_SAML_SUBJECT_STATEMENT_ABSTRACT(
-			LASSO_SAMLP_RESPONSE(profile->response)->Assertion->AuthenticationStatement);
+			LASSO_SAMLP_RESPONSE(profile->response
+				)->Assertion->AuthenticationStatement);
 	ni = authentication_statement->Subject->NameIdentifier;
 
 	if (ni == NULL)
@@ -493,7 +496,8 @@ lasso_login_build_artifact_msg(LassoLogin *login,
 
 		/* fill the response with the assertion */
 		if (ret == 0) {
-			federation = g_hash_table_lookup(LASSO_PROFILE(login)->identity->federations,
+			federation = g_hash_table_lookup(
+					LASSO_PROFILE(login)->identity->federations,
 					LASSO_PROFILE(login)->remote_providerID);
 			lasso_login_build_assertion(login, federation, authenticationMethod,
 					authenticationInstant, reauthenticateOnOrAfter,
@@ -527,7 +531,8 @@ lasso_login_build_artifact_msg(LassoLogin *login,
 					"%s?SAMLart=%s", url, b64_samlArt);
 		} else {
 			LASSO_PROFILE(login)->msg_url = g_strdup_printf(
-					"%s?SAMLart=%s&RelayState=%s", url, b64_samlArt, relayState);
+					"%s?SAMLart=%s&RelayState=%s", 
+					url, b64_samlArt, relayState);
 		}
 	}
 
@@ -626,7 +631,8 @@ lasso_login_build_authn_request_msg(LassoLogin *login, const gchar *remote_provi
 		/* POST -> form */
 #if 0 /* XXX: signatures are done differently */
 		if (must_sign) {
-			ret = lasso_samlp_request_abstract_sign_signature_tmpl(LASSO_SAMLP_REQUEST_ABSTRACT(LASSO_PROFILE(login)->request),
+			ret = lasso_samlp_request_abstract_sign_signature_tmpl(
+					LASSO_SAMLP_REQUEST_ABSTRACT(LASSO_PROFILE(login)->request),
 					LASSO_PROFILE(login)->server->private_key,
 					LASSO_PROFILE(login)->server->certificate);
 			if (ret < 0)
@@ -1127,7 +1133,8 @@ lasso_login_process_authn_request_msg(LassoLogin *login, const char *authn_reque
 		login->protocolProfile = LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_POST;
 	}
 	else {
-		message(G_LOG_LEVEL_CRITICAL, lasso_strerror(LASSO_PROFILE_ERROR_INVALID_PROTOCOLPROFILE));
+		message(G_LOG_LEVEL_CRITICAL, 
+				lasso_strerror(LASSO_PROFILE_ERROR_INVALID_PROTOCOLPROFILE));
 		return LASSO_PROFILE_ERROR_INVALID_PROTOCOLPROFILE;
 	}
 
diff --git a/lasso/id-ff/login.h b/lasso/id-ff/login.h
index 2d7ea608..94b99cfd 100644
--- a/lasso/id-ff/login.h
+++ b/lasso/id-ff/login.h
@@ -40,10 +40,12 @@ extern "C" {
 
 #define LASSO_TYPE_LOGIN (lasso_login_get_type())
 #define LASSO_LOGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LOGIN, LassoLogin))
-#define LASSO_LOGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LOGIN, LassoLoginClass))
+#define LASSO_LOGIN_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LOGIN, LassoLoginClass))
 #define LASSO_IS_LOGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LOGIN))
 #define LASSO_IS_LOGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LOGIN))
-#define LASSO_LOGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LOGIN, LassoLoginClass)) 
+#define LASSO_LOGIN_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LOGIN, LassoLoginClass)) 
 
 typedef struct _LassoLogin LassoLogin;
 typedef struct _LassoLoginClass LassoLoginClass;
@@ -70,16 +72,12 @@ struct _LassoLoginClass {
 	LassoProfileClass parent;
 };
 
-LASSO_EXPORT GType       lasso_login_get_type                   (void);
+LASSO_EXPORT GType lasso_login_get_type(void);
+LASSO_EXPORT LassoLogin* lasso_login_new(LassoServer *server);
+LASSO_EXPORT LassoLogin* lasso_login_new_from_dump(LassoServer *server, const gchar *dump);
+LASSO_EXPORT gint lasso_login_accept_sso(LassoLogin *login);
 
-LASSO_EXPORT LassoLogin* lasso_login_new                        (LassoServer *server);
-
-LASSO_EXPORT LassoLogin* lasso_login_new_from_dump              (LassoServer *server,
-								 const gchar       *dump);
-
-LASSO_EXPORT gint        lasso_login_accept_sso                 (LassoLogin *login);
-
-LASSO_EXPORT gint        lasso_login_build_artifact_msg         (LassoLogin      *login,
+LASSO_EXPORT gint lasso_login_build_artifact_msg(LassoLogin *login,
 		gboolean authentication_result,
 		gboolean is_consent_obtained,
 		const char *authenticationMethod,
@@ -89,10 +87,10 @@ LASSO_EXPORT gint        lasso_login_build_artifact_msg         (LassoLogin
 		const char *notOnOrAfter,
 		lassoHttpMethod http_method);
 
-LASSO_EXPORT gint        lasso_login_build_authn_request_msg    (LassoLogin  *login,
-								 const gchar *remote_providerID);
+LASSO_EXPORT gint lasso_login_build_authn_request_msg(
+		LassoLogin *login, const gchar *remote_providerID);
 
-LASSO_EXPORT gint        lasso_login_build_authn_response_msg   (LassoLogin  *login,
+LASSO_EXPORT gint lasso_login_build_authn_response_msg(LassoLogin *login,
 		gboolean authentication_result,
 		gboolean is_consent_obtained,
 		const char *authenticationMethod,
@@ -101,39 +99,29 @@ LASSO_EXPORT gint        lasso_login_build_authn_response_msg   (LassoLogin  *lo
 		const char *notBefore,
 		const char *notOnOrAfter);
 
-LASSO_EXPORT gint        lasso_login_build_request_msg          (LassoLogin *login);
-
-LASSO_EXPORT gint        lasso_login_build_response_msg         (LassoLogin *login,
-								 gchar      *remote_providerID);
-
-LASSO_EXPORT void        lasso_login_destroy                    (LassoLogin *login);
-
-LASSO_EXPORT gchar*      lasso_login_dump                       (LassoLogin *login);
-
-LASSO_EXPORT gint        lasso_login_init_authn_request         (LassoLogin      *login,
-								 lassoHttpMethod  http_method);
-
-LASSO_EXPORT gint        lasso_login_init_request               (LassoLogin      *login,
-								 gchar           *response_msg,
-								 lassoHttpMethod  response_http_method);
-LASSO_EXPORT gint        lasso_login_init_idp_initiated_authn_request (LassoLogin  *login,
-									const gchar *remote_providerID);
+LASSO_EXPORT gint lasso_login_build_request_msg(LassoLogin *login);
+LASSO_EXPORT gint lasso_login_build_response_msg(LassoLogin *login, gchar *remote_providerID);
+LASSO_EXPORT void lasso_login_destroy(LassoLogin *login);
+LASSO_EXPORT gchar* lasso_login_dump(LassoLogin *login);
+LASSO_EXPORT gint lasso_login_init_authn_request(LassoLogin *login, lassoHttpMethod http_method);
 
-LASSO_EXPORT gboolean    lasso_login_must_ask_for_consent       (LassoLogin *login);
+LASSO_EXPORT gint lasso_login_init_request(LassoLogin *login, gchar *response_msg,
+		lassoHttpMethod response_http_method);
 
-LASSO_EXPORT gboolean    lasso_login_must_authenticate          (LassoLogin *login);
+LASSO_EXPORT gint lasso_login_init_idp_initiated_authn_request(LassoLogin *login,
+		const gchar *remote_providerID);
 
-LASSO_EXPORT int        lasso_login_process_authn_request_msg  (LassoLogin *login,
-								const char *authn_request_msg);
+LASSO_EXPORT gboolean lasso_login_must_ask_for_consent(LassoLogin *login);
+LASSO_EXPORT gboolean lasso_login_must_authenticate(LassoLogin *login);
 
-LASSO_EXPORT gint        lasso_login_process_authn_response_msg (LassoLogin *login,
-								 gchar      *authn_response_msg);
+LASSO_EXPORT int lasso_login_process_authn_request_msg(LassoLogin *login,
+		const char *authn_request_msg);
 
-LASSO_EXPORT gint        lasso_login_process_request_msg        (LassoLogin *login,
-								 gchar      *request_msg);
+LASSO_EXPORT gint lasso_login_process_authn_response_msg(LassoLogin *login,
+		gchar *authn_response_msg);
 
-LASSO_EXPORT gint        lasso_login_process_response_msg        (LassoLogin  *login,
-								  gchar       *response_msg);
+LASSO_EXPORT gint lasso_login_process_request_msg(LassoLogin *login, gchar *request_msg);
+LASSO_EXPORT gint lasso_login_process_response_msg(LassoLogin *login, gchar *response_msg);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c
index 3fc3899d..d25ca726 100644
--- a/lasso/id-ff/logout.c
+++ b/lasso/id-ff/logout.c
@@ -82,7 +82,8 @@ lasso_logout_build_request_msg(LassoLogout *logout)
 	/* build the logout request message */
 	if (logout->initial_http_request_method == LASSO_HTTP_METHOD_SOAP) {
 		/* build the logout request message */
-		profile->msg_url = lasso_provider_get_metadata_one(remote_provider, "SoapEndpoint");
+		profile->msg_url = lasso_provider_get_metadata_one(
+				remote_provider, "SoapEndpoint");
 		profile->msg_body = lasso_node_export_to_soap(profile->request,
 				profile->server->private_key, profile->server->certificate);
 		return 0;
@@ -248,13 +249,14 @@ lasso_logout_get_next_providerID(LassoLogout *logout)
  * First it verifies session and identity are set.
  * Next, gets federation with the remote provider and gets the name identifier for the request.
  *       gets the protocol profile and build the logout request object.
- * If the local provider is a Service Provider and if the protocol profile is a HTTP Redirect / GET method,
- *       then removes the assertion.
+ * If the local provider is a Service Provider and if the protocol profile
+ * is a HTTP Redirect / GET method, then removes the assertion.
  * 
  * Return value: 0 if ok, else < 0
  **/
 gint
-lasso_logout_init_request(LassoLogout *logout, char *remote_providerID, lassoHttpMethod http_method)
+lasso_logout_init_request(LassoLogout *logout, char *remote_providerID,
+		lassoHttpMethod http_method)
 {
 	LassoProfile      *profile;
 	LassoProvider     *remote_provider;
@@ -372,7 +374,7 @@ lasso_logout_init_request(LassoLogout *logout, char *remote_providerID, lassoHtt
 	/* Set the name identifier attribute with content local variable */
 	profile->nameIdentifier = g_strdup(nameIdentifier->content);
 
-	/* if logout request from a SP and if an HTTP Redirect / GET method, then remove assertion */
+	/* if logout request from a SP and if an HTTP Redirect/GET method, then remove assertion */
 	if (remote_provider->role == LASSO_PROVIDER_ROLE_IDP && is_http_redirect_get_method) {
 		lasso_session_remove_assertion(profile->session, profile->remote_providerID);
 	}
@@ -534,7 +536,8 @@ lasso_logout_process_response_msg(LassoLogout *logout, gchar *response_msg)
 			profile->msg_body = NULL;
 
 			/* send a HTTP Redirect / GET method, so first remove session */
-			lasso_session_remove_assertion(profile->session, profile->remote_providerID);
+			lasso_session_remove_assertion(
+					profile->session, profile->remote_providerID);
 
 			return LASSO_LOGOUT_ERROR_UNSUPPORTED_PROFILE;
 		}
@@ -680,7 +683,8 @@ lasso_logout_validate_request(LassoLogout *logout)
 
 	/* verify signature status */
 	if (profile->signature_status != 0) {
-		lasso_profile_set_response_status(profile, LASSO_LIB_STATUS_CODE_INVALID_SIGNATURE);
+		lasso_profile_set_response_status(profile, 
+				LASSO_LIB_STATUS_CODE_INVALID_SIGNATURE);
 	}
 
 	/* Get the name identifier */
diff --git a/lasso/id-ff/logout.h b/lasso/id-ff/logout.h
index e4c0773c..670a92e6 100644
--- a/lasso/id-ff/logout.h
+++ b/lasso/id-ff/logout.h
@@ -36,10 +36,12 @@ extern "C" {
 
 #define LASSO_TYPE_LOGOUT (lasso_logout_get_type())
 #define LASSO_LOGOUT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LOGOUT, LassoLogout))
-#define LASSO_LOGOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LOGOUT, LassoLogoutClass))
+#define LASSO_LOGOUT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LOGOUT, LassoLogoutClass))
 #define LASSO_IS_LOGOUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LOGOUT))
 #define LASSO_IS_LOGOUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LOGOUT))
-#define LASSO_LOGOUT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LOGOUT, LassoLogoutClass)) 
+#define LASSO_LOGOUT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LOGOUT, LassoLogoutClass)) 
 
 typedef struct _LassoLogout LassoLogout;
 typedef struct _LassoLogoutClass LassoLogoutClass;
diff --git a/lasso/id-ff/name_identifier_mapping.h b/lasso/id-ff/name_identifier_mapping.h
index 6d6fb1e8..352c192b 100644
--- a/lasso/id-ff/name_identifier_mapping.h
+++ b/lasso/id-ff/name_identifier_mapping.h
@@ -6,7 +6,7 @@
  * http://lasso.entrouvert.org
  * 
  * Authors: Nicolas Clapies <nclapies@entrouvert.com>
- *          Valery Febvre <vfebvre@easter-eggs.com>
+ * Valery Febvre <vfebvre@easter-eggs.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,12 +15,12 @@
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #ifndef __LASSO_NAME_IDENTIFIER_MAPPING_H__
@@ -36,11 +36,19 @@ extern "C" {
 #include <lasso/xml/lib_name_identifier_mapping_response.h>
 
 #define LASSO_TYPE_NAME_IDENTIFIER_MAPPING (lasso_name_identifier_mapping_get_type())
-#define LASSO_NAME_IDENTIFIER_MAPPING(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_NAME_IDENTIFIER_MAPPING, LassoNameIdentifierMapping))
-#define LASSO_NAME_IDENTIFIER_MAPPING_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_NAME_IDENTIFIER_MAPPING, LassoNameIdentifierMappingClass))
-#define LASSO_IS_NAME_IDENTIFIER_MAPPING(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_NAME_IDENTIFIER_MAPPING))
-#define LASSO_IS_NAME_IDENTIFIER_MAPPING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_NAME_IDENTIFIER_MAPPING))
-#define LASSO_NAME_IDENTIFIER_MAPPING_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_NAME_IDENTIFIER_MAPPING, LassoNameIdentifierMappingClass)) 
+#define LASSO_NAME_IDENTIFIER_MAPPING(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_NAME_IDENTIFIER_MAPPING, \
+				    LassoNameIdentifierMapping))
+#define LASSO_NAME_IDENTIFIER_MAPPING_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_NAME_IDENTIFIER_MAPPING, \
+				 LassoNameIdentifierMappingClass))
+#define LASSO_IS_NAME_IDENTIFIER_MAPPING(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_NAME_IDENTIFIER_MAPPING))
+#define LASSO_IS_NAME_IDENTIFIER_MAPPING_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_NAME_IDENTIFIER_MAPPING))
+#define LASSO_NAME_IDENTIFIER_MAPPING_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_NAME_IDENTIFIER_MAPPING, \
+				    LassoNameIdentifierMappingClass)) 
 
 typedef struct _LassoNameIdentifierMapping LassoNameIdentifierMapping;
 typedef struct _LassoNameIdentifierMappingClass LassoNameIdentifierMappingClass;
@@ -54,28 +62,32 @@ struct _LassoNameIdentifierMappingClass {
 	LassoProfileClass parent;
 };
 
-LASSO_EXPORT GType                       lasso_name_identifier_mapping_get_type             (void);
+LASSO_EXPORT GType lasso_name_identifier_mapping_get_type(void);
 
 LASSO_EXPORT LassoNameIdentifierMapping* lasso_name_identifier_mapping_new(LassoServer *server);
-LASSO_EXPORT gchar * lasso_name_identifier_mapping_dump(LassoNameIdentifierMapping*);
+LASSO_EXPORT gchar* lasso_name_identifier_mapping_dump(LassoNameIdentifierMapping*);
 
-LASSO_EXPORT gint                        lasso_name_identifier_mapping_build_request_msg    (LassoNameIdentifierMapping *mapping);
+LASSO_EXPORT gint lasso_name_identifier_mapping_build_request_msg(
+		LassoNameIdentifierMapping *mapping);
 
-LASSO_EXPORT gint                        lasso_name_identifier_mapping_build_response_msg   (LassoNameIdentifierMapping *mapping);
+LASSO_EXPORT gint lasso_name_identifier_mapping_build_response_msg(
+		LassoNameIdentifierMapping *mapping);
 
-LASSO_EXPORT void                        lasso_name_identifier_mapping_destroy              (LassoNameIdentifierMapping *mapping);
+LASSO_EXPORT void lasso_name_identifier_mapping_destroy(
+		LassoNameIdentifierMapping *mapping);
 
-LASSO_EXPORT gint                        lasso_name_identifier_mapping_init_request         (LassoNameIdentifierMapping *mapping,
-											     gchar                      *targetNameSpace,
-											     gchar                      *remote_providerID);
+LASSO_EXPORT gint lasso_name_identifier_mapping_init_request(
+		LassoNameIdentifierMapping *mapping,
+		gchar *targetNameSpace, gchar *remote_providerID);
 
-LASSO_EXPORT gint                        lasso_name_identifier_mapping_process_request_msg  (LassoNameIdentifierMapping *mapping,
-											     gchar                      *request_msg);
+LASSO_EXPORT gint lasso_name_identifier_mapping_process_request_msg(
+		LassoNameIdentifierMapping *mapping, gchar *request_msg); 
 
-LASSO_EXPORT gint                        lasso_name_identifier_mapping_process_response_msg (LassoNameIdentifierMapping *mapping,
-											     gchar                      *response_msg);
+LASSO_EXPORT gint lasso_name_identifier_mapping_process_response_msg(
+		LassoNameIdentifierMapping *mapping, gchar *response_msg);
 
-LASSO_EXPORT gint                        lasso_name_identifier_mapping_validate_request     (LassoNameIdentifierMapping *mapping);
+LASSO_EXPORT gint lasso_name_identifier_mapping_validate_request(
+		LassoNameIdentifierMapping *mapping);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/id-ff/name_registration.h b/lasso/id-ff/name_registration.h
index 1626ed30..c057a9e6 100644
--- a/lasso/id-ff/name_registration.h
+++ b/lasso/id-ff/name_registration.h
@@ -6,7 +6,7 @@
  * http://lasso.entrouvert.org
  * 
  * Authors: Nicolas Clapies <nclapies@entrouvert.com>
- *          Valery Febvre <vfebvre@easter-eggs.com>
+ * Valery Febvre <vfebvre@easter-eggs.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,12 +15,12 @@
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #ifndef __LASSO_NAME_REGISTRATION_H__
@@ -36,11 +36,16 @@ extern "C" {
 #include <lasso/xml/lib_register_name_identifier_response.h>
 
 #define LASSO_TYPE_NAME_REGISTRATION (lasso_name_registration_get_type())
-#define LASSO_NAME_REGISTRATION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_NAME_REGISTRATION, LassoNameRegistration))
-#define LASSO_NAME_REGISTRATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_NAME_REGISTRATION, LassoNameRegistrationClass))
-#define LASSO_IS_NAME_REGISTRATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_NAME_REGISTRATION))
-#define LASSO_IS_NAME_REGISTRATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_NAME_REGISTRATION))
-#define LASSO_NAME_REGISTRATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_NAME_REGISTRATION, LassoNameRegistrationClass)) 
+#define LASSO_NAME_REGISTRATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_NAME_REGISTRATION, LassoNameRegistration))
+#define LASSO_NAME_REGISTRATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_NAME_REGISTRATION, LassoNameRegistrationClass))
+#define LASSO_IS_NAME_REGISTRATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_NAME_REGISTRATION))
+#define LASSO_IS_NAME_REGISTRATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_NAME_REGISTRATION))
+#define LASSO_NAME_REGISTRATION_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_NAME_REGISTRATION, LassoNameRegistrationClass))
 
 typedef struct _LassoNameRegistration LassoNameRegistration;
 typedef struct _LassoNameRegistrationClass LassoNameRegistrationClass;
@@ -54,32 +59,35 @@ struct _LassoNameRegistrationClass {
 	LassoProfileClass parent;
 };
 
-LASSO_EXPORT GType                  lasso_name_registration_get_type      (void);
+LASSO_EXPORT GType lasso_name_registration_get_type (void);
 
 LASSO_EXPORT LassoNameRegistration* lasso_name_registration_new(LassoServer *server);
 
 LASSO_EXPORT LassoNameRegistration* lasso_name_registration_new_from_dump(
 		LassoServer *server, const char *dump);
 
-LASSO_EXPORT gint            lasso_name_registration_build_request_msg    (LassoNameRegistration *name_registration);
+LASSO_EXPORT gint lasso_name_registration_build_request_msg(
+		LassoNameRegistration *name_registration);
 
-LASSO_EXPORT gint            lasso_name_registration_build_response_msg   (LassoNameRegistration *name_registration);
+LASSO_EXPORT gint lasso_name_registration_build_response_msg(
+		LassoNameRegistration *name_registration);
 
-LASSO_EXPORT void            lasso_name_registration_destroy              (LassoNameRegistration *name_registration);
+LASSO_EXPORT void lasso_name_registration_destroy(LassoNameRegistration *name_registration);
 
-LASSO_EXPORT gchar*          lasso_name_registration_dump                 (LassoNameRegistration *name_registration);
+LASSO_EXPORT gchar* lasso_name_registration_dump(LassoNameRegistration *name_registration);
 
 LASSO_EXPORT gint lasso_name_registration_init_request(LassoNameRegistration *name_registration,
 		char *remote_providerID, lassoHttpMethod http_method);
 
-LASSO_EXPORT gint            lasso_name_registration_process_request_msg  (LassoNameRegistration *name_registration,
-									   gchar                 *request_msg);
+LASSO_EXPORT gint lasso_name_registration_process_request_msg(
+		LassoNameRegistration *name_registration, gchar *request_msg);
 
-LASSO_EXPORT gint            lasso_name_registration_process_response_msg (LassoNameRegistration *name_registration,
-									   gchar                 *response_msg);
+LASSO_EXPORT gint lasso_name_registration_process_response_msg(
+		LassoNameRegistration *name_registration, gchar *response_msg);
 
-LASSO_EXPORT gint            lasso_name_registration_validate_request     (LassoNameRegistration *name_registration);
-  
+LASSO_EXPORT gint lasso_name_registration_validate_request(
+		LassoNameRegistration *name_registration);
+ 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/lasso/id-ff/profile.h b/lasso/id-ff/profile.h
index 590cf5ef..f151251b 100644
--- a/lasso/id-ff/profile.h
+++ b/lasso/id-ff/profile.h
@@ -37,10 +37,12 @@ extern "C" {
 
 #define LASSO_TYPE_PROFILE (lasso_profile_get_type())
 #define LASSO_PROFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_PROFILE, LassoProfile))
-#define LASSO_PROFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_PROFILE, LassoProfileClass))
+#define LASSO_PROFILE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_PROFILE, LassoProfileClass))
 #define LASSO_IS_PROFILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_PROFILE))
 #define LASSO_IS_PROFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_PROFILE))
-#define LASSO_PROFILE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_PROFILE, LassoProfileClass)) 
+#define LASSO_PROFILE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_PROFILE, LassoProfileClass)) 
 
 typedef struct _LassoProfile LassoProfile;
 typedef struct _LassoProfileClass LassoProfileClass;
@@ -99,37 +101,28 @@ struct _LassoProfileClass {
 
 /* public functions */
 
-LASSO_EXPORT lassoRequestType lasso_profile_get_request_type_from_soap_msg (const gchar *soap);
+LASSO_EXPORT lassoRequestType lasso_profile_get_request_type_from_soap_msg(const gchar *soap);
+LASSO_EXPORT gboolean lasso_profile_is_liberty_query(const gchar *query);
 
-LASSO_EXPORT gboolean         lasso_profile_is_liberty_query               (const gchar *query);
 
 /* public methods */
 
-LASSO_EXPORT GType          lasso_profile_get_type                       (void);
+LASSO_EXPORT GType lasso_profile_get_type(void);
 
-LASSO_EXPORT LassoProfile*  lasso_profile_new                            (LassoServer   *server,
-									  LassoIdentity *identity,
-									  LassoSession  *session);
+LASSO_EXPORT LassoProfile* lasso_profile_new(LassoServer *server,
+		LassoIdentity *identity, LassoSession *session);
 
-LASSO_EXPORT gchar*         lasso_profile_dump                           (LassoProfile *ctx);
+LASSO_EXPORT gchar* lasso_profile_dump(LassoProfile *ctx);
+LASSO_EXPORT LassoIdentity* lasso_profile_get_identity(LassoProfile *ctx);
+LASSO_EXPORT LassoSession* lasso_profile_get_session(LassoProfile *ctx);
+LASSO_EXPORT gboolean lasso_profile_is_identity_dirty(LassoProfile *ctx);
+LASSO_EXPORT gboolean lasso_profile_is_session_dirty(LassoProfile *ctx);
 
-LASSO_EXPORT LassoIdentity* lasso_profile_get_identity                   (LassoProfile *ctx);
-
-LASSO_EXPORT LassoSession*  lasso_profile_get_session                    (LassoProfile *ctx);
-
-LASSO_EXPORT gboolean       lasso_profile_is_identity_dirty              (LassoProfile *ctx);
-
-LASSO_EXPORT gboolean       lasso_profile_is_session_dirty               (LassoProfile *ctx);
-
-LASSO_EXPORT void           lasso_profile_set_response_status            (LassoProfile *ctx,
-									  const gchar  *statusCodeValue);
-
-LASSO_EXPORT gint           lasso_profile_set_identity_from_dump         (LassoProfile *ctx,
-									  const gchar  *dump);
-
-LASSO_EXPORT gint           lasso_profile_set_session_from_dump          (LassoProfile *ctx,
-									  const gchar  *dump);
+LASSO_EXPORT void lasso_profile_set_response_status(
+		LassoProfile *ctx, const gchar *statusCodeValue);
 
+LASSO_EXPORT gint lasso_profile_set_identity_from_dump(LassoProfile *ctx, const gchar *dump);
+LASSO_EXPORT gint lasso_profile_set_session_from_dump(LassoProfile *ctx, const gchar *dump);
 LASSO_EXPORT LassoSamlNameIdentifier* lasso_profile_get_nameIdentifier(LassoProfile *ctx);
 
 #ifdef __cplusplus
diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c
index eeb142e1..b5afdafe 100644
--- a/lasso/id-ff/provider.c
+++ b/lasso/id-ff/provider.c
@@ -429,7 +429,7 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata)
 }
 
 LassoProvider*
-lasso_provider_new(LassoProviderRole role, gchar *metadata, gchar *public_key, gchar *ca_cert_chain)
+lasso_provider_new(LassoProviderRole role, char *metadata, char *public_key, char *ca_cert_chain)
 {
 	LassoProvider *provider;
 
diff --git a/lasso/id-ff/provider.h b/lasso/id-ff/provider.h
index 500bbdad..1441990d 100644
--- a/lasso/id-ff/provider.h
+++ b/lasso/id-ff/provider.h
@@ -33,11 +33,14 @@ extern "C" {
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_PROVIDER (lasso_provider_get_type())
-#define LASSO_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_PROVIDER, LassoProvider))
-#define LASSO_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_PROVIDER, LassoProviderClass))
+#define LASSO_PROVIDER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_PROVIDER, LassoProvider))
+#define LASSO_PROVIDER_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_PROVIDER, LassoProviderClass))
 #define LASSO_IS_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_PROVIDER))
 #define LASSO_IS_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_PROVIDER))
-#define LASSO_PROVIDER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_PROVIDER, LassoProviderClass)) 
+#define LASSO_PROVIDER_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_PROVIDER, LassoProviderClass)) 
 
 typedef struct _LassoProvider LassoProvider;
 typedef struct _LassoProviderClass LassoProviderClass;
@@ -84,8 +87,8 @@ struct _LassoProviderClass {
 };
 
 LASSO_EXPORT GType lasso_provider_get_type(void);
-LASSO_EXPORT LassoProvider* lasso_provider_new(LassoProviderRole role, gchar *metadata,
-		gchar *public_key, gchar *ca_cert_chain);
+LASSO_EXPORT LassoProvider* lasso_provider_new(LassoProviderRole role, char *metadata,
+		char *public_key, char *ca_cert_chain);
 LASSO_EXPORT gchar* lasso_provider_get_metadata_one(LassoProvider *provider, const char *name);
 LASSO_EXPORT GList* lasso_provider_get_metadata_list(LassoProvider *provider, const char *name);
 
diff --git a/lasso/id-ff/server.h b/lasso/id-ff/server.h
index a546ffcc..9e831758 100644
--- a/lasso/id-ff/server.h
+++ b/lasso/id-ff/server.h
@@ -34,10 +34,12 @@ extern "C" {
 
 #define LASSO_TYPE_SERVER (lasso_server_get_type())
 #define LASSO_SERVER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SERVER, LassoServer))
-#define LASSO_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SERVER, LassoServerClass))
+#define LASSO_SERVER_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SERVER, LassoServerClass))
 #define LASSO_IS_SERVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SERVER))
 #define LASSO_IS_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SERVER))
-#define LASSO_SERVER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SERVER, LassoServerClass)) 
+#define LASSO_SERVER_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SERVER, LassoServerClass)) 
 
 typedef struct _LassoServer LassoServer;
 typedef struct _LassoServerClass LassoServerClass;
@@ -58,34 +60,26 @@ struct _LassoServer {
 };
 
 struct _LassoServerClass {
-  LassoProviderClass parent;
+	LassoProviderClass parent;
 };
 
-LASSO_EXPORT GType                lasso_server_get_type                 (void);
+LASSO_EXPORT GType lasso_server_get_type(void);
 
-LASSO_EXPORT LassoServer*         lasso_server_new                      (const gchar *metadata,
-									 const gchar *private_key,
-									 const gchar *secret_key,
-									 const gchar *certificate);
+LASSO_EXPORT LassoServer* lasso_server_new(const gchar *metadata,
+		const gchar *private_key,
+		const gchar *secret_key,
+		const gchar *certificate);
 
-LASSO_EXPORT LassoServer*         lasso_server_new_from_dump            (const gchar       *dump);
+LASSO_EXPORT LassoServer* lasso_server_new_from_dump(const gchar *dump);
 
-LASSO_EXPORT gint                 lasso_server_add_provider             (LassoServer *server,
-		LassoProviderRole role,
-		gchar       *metadata,
-		gchar       *public_key,
-		gchar       *ca_cert_chain);
-
-LASSO_EXPORT void                 lasso_server_destroy                  (LassoServer *server);
-
-LASSO_EXPORT gchar*               lasso_server_get_first_providerID     (LassoServer *server);
-
-LASSO_EXPORT LassoProvider*       lasso_server_get_provider             (LassoServer  *server,
-									 gchar        *providerID);
-
-LASSO_EXPORT gchar*               lasso_server_get_providerID_from_hash (LassoServer *server,
-									 gchar       *b64_hash);
+LASSO_EXPORT gint lasso_server_add_provider (LassoServer *server,
+		LassoProviderRole role, gchar *metadata,
+		gchar *public_key, gchar *ca_cert_chain);
 
+LASSO_EXPORT void lasso_server_destroy(LassoServer *server);
+LASSO_EXPORT gchar* lasso_server_get_first_providerID(LassoServer *server);
+LASSO_EXPORT LassoProvider* lasso_server_get_provider(LassoServer *server, gchar *providerID);
+LASSO_EXPORT gchar* lasso_server_get_providerID_from_hash(LassoServer *server, gchar *b64_hash);
 LASSO_EXPORT gchar* lasso_server_dump(LassoServer *server);
 
 #ifdef __cplusplus
diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c
index 58c1a967..0a1ba77a 100644
--- a/lasso/id-ff/session.c
+++ b/lasso/id-ff/session.c
@@ -36,7 +36,7 @@ struct _LassoSessionPrivate
 /*****************************************************************************/
 
 gint
-lasso_session_add_assertion(LassoSession *session, gchar *providerID, LassoSamlAssertion *assertion)
+lasso_session_add_assertion(LassoSession *session, char *providerID, LassoSamlAssertion *assertion)
 {
 	g_return_val_if_fail(session != NULL, -1);
 	g_return_val_if_fail(providerID != NULL, -2);
@@ -80,7 +80,8 @@ lasso_session_get_first_providerID(LassoSession *session)
 static void
 add_providerID(gchar *key, LassoLibAssertion *assertion, LassoSession *session)
 {
-	session->private_data->providerIDs = g_list_append(session->private_data->providerIDs, key);
+	session->private_data->providerIDs = g_list_append(
+			session->private_data->providerIDs, key);
 }
 
 gchar*
@@ -140,7 +141,8 @@ get_xmlNode(LassoNode *node)
 	xmlSetProp(xmlnode, "Version", "2");
 
 	if (g_hash_table_size(session->assertions))
-		g_hash_table_foreach(session->assertions, (GHFunc)add_assertion_childnode, xmlnode);
+		g_hash_table_foreach(session->assertions,
+				(GHFunc)add_assertion_childnode, xmlnode);
 
 	return xmlnode;
 }
diff --git a/lasso/id-ff/session.h b/lasso/id-ff/session.h
index 63263b37..22c86b63 100644
--- a/lasso/id-ff/session.h
+++ b/lasso/id-ff/session.h
@@ -35,10 +35,12 @@ extern "C" {
 
 #define LASSO_TYPE_SESSION (lasso_session_get_type())
 #define LASSO_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SESSION, LassoSession))
-#define LASSO_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SESSION, LassoSessionClass))
+#define LASSO_SESSION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SESSION, LassoSessionClass))
 #define LASSO_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SESSION))
 #define LASSO_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SESSION))
-#define LASSO_SESSION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SESSION, LassoSessionClass)) 
+#define LASSO_SESSION_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SESSION, LassoSessionClass)) 
 
 typedef struct _LassoSession LassoSession;
 typedef struct _LassoSessionClass LassoSessionClass;
@@ -58,14 +60,14 @@ struct _LassoSessionClass {
 	LassoNodeClass parent;
 };
 
-LASSO_EXPORT GType          lasso_session_get_type                             (void);
+LASSO_EXPORT GType lasso_session_get_type(void);
 
-LASSO_EXPORT LassoSession*  lasso_session_new                                  (void);
+LASSO_EXPORT LassoSession* lasso_session_new(void);
 
 LASSO_EXPORT LassoSession* lasso_session_new_from_dump(const gchar *dump);
 
 LASSO_EXPORT gint lasso_session_add_assertion(LassoSession *session,
-		gchar *providerID, LassoSamlAssertion *assertion);
+		char *providerID, LassoSamlAssertion *assertion);
   
 LASSO_EXPORT gchar* lasso_session_dump(LassoSession *session);
 
diff --git a/lasso/lasso.c b/lasso/lasso.c
index 64ff030d..5419c0eb 100644
--- a/lasso/lasso.c
+++ b/lasso/lasso.c
@@ -160,7 +160,9 @@ lasso_check_version_ext(int major, int minor, int subminor, lassoCheckVersionMod
 
 	if (mode == LASSO_CHECK_VERSION_EXACT) {
 		if (minor != LASSO_VERSION_MINOR || subminor != LASSO_VERSION_SUBMINOR) {
-			g_message("mode=exact;expected minor version=%d;real minor version=%d;expected subminor version=%d;real subminor version=%d",
+			g_message("mode=exact;expected minor version=%d;"
+					"real minor version=%d;expected subminor version=%d;"
+					"real subminor version=%d",
 					LASSO_VERSION_MINOR, minor,
 					LASSO_VERSION_SUBMINOR, subminor);
 			return 0;
@@ -169,7 +171,9 @@ lasso_check_version_ext(int major, int minor, int subminor, lassoCheckVersionMod
 	if (mode == LASSO_CHECK_VERSIONABI_COMPATIBLE) {
 		if (minor < LASSO_VERSION_MINOR || (minor == LASSO_VERSION_MINOR && 
 					subminor < LASSO_VERSION_SUBMINOR)) {
-			g_message("mode=abi compatible;expected minor version=%d;real minor version=%d;expected subminor version=%d;real subminor version=%d",
+			g_message("mode=abi compatible;expected minor version=%d;"
+					"real minor version=%d;expected subminor version=%d;"
+					"real subminor version=%d",
 					LASSO_VERSION_MINOR, minor,
 					LASSO_VERSION_SUBMINOR, subminor);
 			return 0;
diff --git a/lasso/xml/lib_assertion.h b/lasso/xml/lib_assertion.h
index 574df7ad..7529f2e9 100644
--- a/lasso/xml/lib_assertion.h
+++ b/lasso/xml/lib_assertion.h
@@ -33,11 +33,16 @@ extern "C" {
 #include <lasso/xml/saml_assertion.h>
 
 #define LASSO_TYPE_LIB_ASSERTION (lasso_lib_assertion_get_type())
-#define LASSO_LIB_ASSERTION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_ASSERTION, LassoLibAssertion))
-#define LASSO_LIB_ASSERTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_ASSERTION, LassoLibAssertionClass))
-#define LASSO_IS_LIB_ASSERTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_ASSERTION))
-#define LASSO_IS_LIB_ASSERTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_ASSERTION))
-#define LASSO_LIB_ASSERTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_ASSERTION, LassoLibAssertionClass)) 
+#define LASSO_LIB_ASSERTION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_ASSERTION, LassoLibAssertion))
+#define LASSO_LIB_ASSERTION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_ASSERTION, LassoLibAssertionClass))
+#define LASSO_IS_LIB_ASSERTION(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_ASSERTION))
+#define LASSO_IS_LIB_ASSERTION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_ASSERTION))
+#define LASSO_LIB_ASSERTION_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_ASSERTION, LassoLibAssertionClass)) 
 
 typedef struct _LassoLibAssertion LassoLibAssertion;
 typedef struct _LassoLibAssertionClass LassoLibAssertionClass;
diff --git a/lasso/xml/lib_authentication_statement.c b/lasso/xml/lib_authentication_statement.c
index 4472ccb4..6c5dcaa1 100644
--- a/lasso/xml/lib_authentication_statement.c
+++ b/lasso/xml/lib_authentication_statement.c
@@ -29,7 +29,8 @@
 /*
 The schema fragment (liberty-idff-protocols-schema-v1.2.xsd):
 
-<xs:element name="AuthenticationStatement" type="AuthenticationStatementType" substitutionGroup="saml:Statement"/>
+<xs:element name="AuthenticationStatement" type="AuthenticationStatementType"
+  substitutionGroup="saml:Statement"/>
 <xs:complexType name="AuthenticationStatementType">
   <xs:complexContent>
     <xs:extension base="saml:AuthenticationStatementType">
diff --git a/lasso/xml/lib_authentication_statement.h b/lasso/xml/lib_authentication_statement.h
index 0f5c6da7..09e887ba 100644
--- a/lasso/xml/lib_authentication_statement.h
+++ b/lasso/xml/lib_authentication_statement.h
@@ -34,11 +34,19 @@ extern "C" {
 #include <lasso/xml/lib_authn_context.h>
 
 #define LASSO_TYPE_LIB_AUTHENTICATION_STATEMENT (lasso_lib_authentication_statement_get_type())
-#define LASSO_LIB_AUTHENTICATION_STATEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_AUTHENTICATION_STATEMENT, LassoLibAuthenticationStatement))
-#define LASSO_LIB_AUTHENTICATION_STATEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_AUTHENTICATION_STATEMENT, LassoLibAuthenticationStatementClass))
-#define LASSO_IS_LIB_AUTHENTICATION_STATEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_AUTHENTICATION_STATEMENT))
-#define LASSO_IS_LIB_AUTHENTICATION_STATEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_AUTHENTICATION_STATEMENT))
-#define LASSO_LIB_AUTHENTICATION_STATEMENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_AUTHENTICATION_STATEMENT, LassoLibAuthenticationStatementClass)) 
+#define LASSO_LIB_AUTHENTICATION_STATEMENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_AUTHENTICATION_STATEMENT, \
+				    LassoLibAuthenticationStatement))
+#define LASSO_LIB_AUTHENTICATION_STATEMENT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_AUTHENTICATION_STATEMENT, \
+				 LassoLibAuthenticationStatementClass))
+#define LASSO_IS_LIB_AUTHENTICATION_STATEMENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_AUTHENTICATION_STATEMENT))
+#define LASSO_IS_LIB_AUTHENTICATION_STATEMENT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_AUTHENTICATION_STATEMENT))
+#define LASSO_LIB_AUTHENTICATION_STATEMENT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_AUTHENTICATION_STATEMENT, \
+				    LassoLibAuthenticationStatementClass)) 
 
 typedef struct _LassoLibAuthenticationStatement LassoLibAuthenticationStatement;
 typedef struct _LassoLibAuthenticationStatementClass LassoLibAuthenticationStatementClass;
diff --git a/lasso/xml/lib_authn_context.h b/lasso/xml/lib_authn_context.h
index 9a000a89..42c3dd39 100644
--- a/lasso/xml/lib_authn_context.h
+++ b/lasso/xml/lib_authn_context.h
@@ -33,11 +33,16 @@ extern "C" {
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_LIB_AUTHN_CONTEXT (lasso_lib_authn_context_get_type())
-#define LASSO_LIB_AUTHN_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_AUTHN_CONTEXT, LassoLibAuthnContext))
-#define LASSO_LIB_AUTHN_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_AUTHN_CONTEXT, LassoLibAuthnContextClass))
-#define LASSO_IS_LIB_AUTHN_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_AUTHN_CONTEXT))
-#define LASSO_IS_LIB_AUTHN_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_AUTHN_CONTEXT))
-#define LASSO_LIB_AUTHN_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_AUTHN_CONTEXT, LassoLibAuthnContextClass)) 
+#define LASSO_LIB_AUTHN_CONTEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_AUTHN_CONTEXT, LassoLibAuthnContext))
+#define LASSO_LIB_AUTHN_CONTEXT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_AUTHN_CONTEXT, LassoLibAuthnContextClass))
+#define LASSO_IS_LIB_AUTHN_CONTEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_AUTHN_CONTEXT))
+#define LASSO_IS_LIB_AUTHN_CONTEXT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_AUTHN_CONTEXT))
+#define LASSO_LIB_AUTHN_CONTEXT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_AUTHN_CONTEXT, LassoLibAuthnContextClass)) 
 
 typedef struct _LassoLibAuthnContext LassoLibAuthnContext;
 typedef struct _LassoLibAuthnContextClass LassoLibAuthnContextClass;
diff --git a/lasso/xml/lib_authn_request.h b/lasso/xml/lib_authn_request.h
index bc77b889..743a0df0 100644
--- a/lasso/xml/lib_authn_request.h
+++ b/lasso/xml/lib_authn_request.h
@@ -35,11 +35,16 @@ extern "C" {
 #include <lasso/xml/lib_scoping.h>
 
 #define LASSO_TYPE_LIB_AUTHN_REQUEST (lasso_lib_authn_request_get_type())
-#define LASSO_LIB_AUTHN_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_AUTHN_REQUEST, LassoLibAuthnRequest))
-#define LASSO_LIB_AUTHN_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_AUTHN_REQUEST, LassoLibAuthnRequestClass))
-#define LASSO_IS_LIB_AUTHN_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_AUTHN_REQUEST))
-#define LASSO_IS_LIB_AUTHN_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_AUTHN_REQUEST))
-#define LASSO_LIB_AUTHN_REQUEST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_AUTHN_REQUEST, LassoLibAuthnRequestClass)) 
+#define LASSO_LIB_AUTHN_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_AUTHN_REQUEST, LassoLibAuthnRequest))
+#define LASSO_LIB_AUTHN_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_AUTHN_REQUEST, LassoLibAuthnRequestClass))
+#define LASSO_IS_LIB_AUTHN_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_AUTHN_REQUEST))
+#define LASSO_IS_LIB_AUTHN_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_AUTHN_REQUEST))
+#define LASSO_LIB_AUTHN_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_AUTHN_REQUEST, LassoLibAuthnRequestClass)) 
 
 typedef struct _LassoLibAuthnRequest LassoLibAuthnRequest;
 typedef struct _LassoLibAuthnRequestClass LassoLibAuthnRequestClass;
diff --git a/lasso/xml/lib_authn_request_envelope.h b/lasso/xml/lib_authn_request_envelope.h
index 1575aa93..a0c37e38 100644
--- a/lasso/xml/lib_authn_request_envelope.h
+++ b/lasso/xml/lib_authn_request_envelope.h
@@ -35,11 +35,19 @@ extern "C" {
 #include <lasso/xml/lib_authn_request.h>
 
 #define LASSO_TYPE_LIB_AUTHN_REQUEST_ENVELOPE (lasso_lib_authn_request_envelope_get_type())
-#define LASSO_LIB_AUTHN_REQUEST_ENVELOPE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_AUTHN_REQUEST_ENVELOPE, LassoLibAuthnRequestEnvelope))
-#define LASSO_LIB_AUTHN_REQUEST_ENVELOPE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_AUTHN_REQUEST_ENVELOPE, LassoLibAuthnRequestEnvelopeClass))
-#define LASSO_IS_LIB_AUTHN_REQUEST_ENVELOPE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_AUTHN_REQUEST_ENVELOPE))
-#define LASSO_IS_LIB_AUTHN_REQUEST_ENVELOPE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_AUTHN_REQUEST_ENVELOPE))
-#define LASSO_LIB_AUTHN_REQUEST_ENVELOPE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_AUTHN_REQUEST_ENVELOPE, LassoLibAuthnRequestEnvelopeClass)) 
+#define LASSO_LIB_AUTHN_REQUEST_ENVELOPE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_AUTHN_REQUEST_ENVELOPE, \
+				    LassoLibAuthnRequestEnvelope))
+#define LASSO_LIB_AUTHN_REQUEST_ENVELOPE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_AUTHN_REQUEST_ENVELOPE, \
+				 LassoLibAuthnRequestEnvelopeClass))
+#define LASSO_IS_LIB_AUTHN_REQUEST_ENVELOPE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_AUTHN_REQUEST_ENVELOPE))
+#define LASSO_IS_LIB_AUTHN_REQUEST_ENVELOPE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_AUTHN_REQUEST_ENVELOPE))
+#define LASSO_LIB_AUTHN_REQUEST_ENVELOPE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_AUTHN_REQUEST_ENVELOPE, \
+				    LassoLibAuthnRequestEnvelopeClass)) 
 
 typedef struct _LassoLibAuthnRequestEnvelope LassoLibAuthnRequestEnvelope;
 typedef struct _LassoLibAuthnRequestEnvelopeClass LassoLibAuthnRequestEnvelopeClass;
diff --git a/lasso/xml/lib_authn_response.h b/lasso/xml/lib_authn_response.h
index b99fdb8a..0b1a5ce5 100644
--- a/lasso/xml/lib_authn_response.h
+++ b/lasso/xml/lib_authn_response.h
@@ -34,11 +34,18 @@ extern "C" {
 #include <lasso/xml/lib_authn_request.h>
 
 #define LASSO_TYPE_LIB_AUTHN_RESPONSE (lasso_lib_authn_response_get_type())
-#define LASSO_LIB_AUTHN_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_AUTHN_RESPONSE, LassoLibAuthnResponse))
-#define LASSO_LIB_AUTHN_RESPONSE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_AUTHN_RESPONSE, LassoLibAuthnResponseClass))
-#define LASSO_IS_LIB_AUTHN_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_AUTHN_RESPONSE))
-#define LASSO_IS_LIB_AUTHN_RESPONSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_AUTHN_RESPONSE))
-#define LASSO_LIB_AUTHN_RESPONSE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_AUTHN_RESPONSE, LassoLibAuthnResponseClass)) 
+#define LASSO_LIB_AUTHN_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_AUTHN_RESPONSE, LassoLibAuthnResponse))
+#define LASSO_LIB_AUTHN_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+				 LASSO_TYPE_LIB_AUTHN_RESPONSE, LassoLibAuthnResponseClass))
+#define LASSO_IS_LIB_AUTHN_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_AUTHN_RESPONSE))
+#define LASSO_IS_LIB_AUTHN_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_AUTHN_RESPONSE))
+#define LASSO_LIB_AUTHN_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_AUTHN_RESPONSE, \
+				    LassoLibAuthnResponseClass)) 
 
 typedef struct _LassoLibAuthnResponse LassoLibAuthnResponse;
 typedef struct _LassoLibAuthnResponseClass LassoLibAuthnResponseClass;
diff --git a/lasso/xml/lib_authn_response_envelope.h b/lasso/xml/lib_authn_response_envelope.h
index 66a1cd10..b413b325 100644
--- a/lasso/xml/lib_authn_response_envelope.h
+++ b/lasso/xml/lib_authn_response_envelope.h
@@ -32,11 +32,19 @@ extern "C" {
 #include <lasso/xml/lib_authn_response.h>
 
 #define LASSO_TYPE_LIB_AUTHN_RESPONSE_ENVELOPE (lasso_lib_authn_response_envelope_get_type())
-#define LASSO_LIB_AUTHN_RESPONSE_ENVELOPE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_AUTHN_RESPONSE_ENVELOPE, LassoLibAuthnResponseEnvelope))
-#define LASSO_LIB_AUTHN_RESPONSE_ENVELOPE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_AUTHN_RESPONSE_ENVELOPE, LassoLibAuthnResponseEnvelopeClass))
-#define LASSO_IS_LIB_AUTHN_RESPONSE_ENVELOPE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_AUTHN_RESPONSE_ENVELOPE))
-#define LASSO_IS_LIB_AUTHN_RESPONSE_ENVELOPE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_AUTHN_RESPONSE_ENVELOPE))
-#define LASSO_LIB_AUTHN_RESPONSE_ENVELOPE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_AUTHN_RESPONSE_ENVELOPE, LassoLibAuthnResponseEnvelopeClass)) 
+#define LASSO_LIB_AUTHN_RESPONSE_ENVELOPE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_AUTHN_RESPONSE_ENVELOPE, \
+				    LassoLibAuthnResponseEnvelope))
+#define LASSO_LIB_AUTHN_RESPONSE_ENVELOPE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_AUTHN_RESPONSE_ENVELOPE, \
+				 LassoLibAuthnResponseEnvelopeClass))
+#define LASSO_IS_LIB_AUTHN_RESPONSE_ENVELOPE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_AUTHN_RESPONSE_ENVELOPE))
+#define LASSO_IS_LIB_AUTHN_RESPONSE_ENVELOPE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_AUTHN_RESPONSE_ENVELOPE))
+#define LASSO_LIB_AUTHN_RESPONSE_ENVELOPE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_AUTHN_RESPONSE_ENVELOPE, \
+				    LassoLibAuthnResponseEnvelopeClass)) 
 
 typedef struct _LassoLibAuthnResponseEnvelope LassoLibAuthnResponseEnvelope;
 typedef struct _LassoLibAuthnResponseEnvelopeClass LassoLibAuthnResponseEnvelopeClass;
diff --git a/lasso/xml/lib_federation_termination_notification.h b/lasso/xml/lib_federation_termination_notification.h
index c7377549..f82cef90 100644
--- a/lasso/xml/lib_federation_termination_notification.h
+++ b/lasso/xml/lib_federation_termination_notification.h
@@ -33,15 +33,26 @@ extern "C" {
 #include <lasso/xml/saml_name_identifier.h>
 #include <lasso/xml/samlp_request_abstract.h>
 
-#define LASSO_TYPE_LIB_FEDERATION_TERMINATION_NOTIFICATION (lasso_lib_federation_termination_notification_get_type())
-#define LASSO_LIB_FEDERATION_TERMINATION_NOTIFICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_FEDERATION_TERMINATION_NOTIFICATION, LassoLibFederationTerminationNotification))
-#define LASSO_LIB_FEDERATION_TERMINATION_NOTIFICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_FEDERATION_TERMINATION_NOTIFICATION, LassoLibFederationTerminationNotificationClass))
-#define LASSO_IS_LIB_FEDERATION_TERMINATION_NOTIFICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_FEDERATION_TERMINATION_NOTIFICATION))
-#define LASSO_IS_LIB_FEDERATION_TERMINATION_NOTIFICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_FEDERATION_TERMINATION_NOTIFICATION))
-#define LASSO_LIB_FEDERATION_TERMINATION_NOTIFICATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_FEDERATION_TERMINATION_NOTIFICATION, LassoLibFederationTerminationNotificationClass)) 
+#define LASSO_TYPE_LIB_FEDERATION_TERMINATION_NOTIFICATION \
+	(lasso_lib_federation_termination_notification_get_type())
+#define LASSO_LIB_FEDERATION_TERMINATION_NOTIFICATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_FEDERATION_TERMINATION_NOTIFICATION, \
+				    LassoLibFederationTerminationNotification))
+#define LASSO_LIB_FEDERATION_TERMINATION_NOTIFICATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_FEDERATION_TERMINATION_NOTIFICATION, \
+				 LassoLibFederationTerminationNotificationClass))
+#define LASSO_IS_LIB_FEDERATION_TERMINATION_NOTIFICATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_FEDERATION_TERMINATION_NOTIFICATION))
+#define LASSO_IS_LIB_FEDERATION_TERMINATION_NOTIFICATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_FEDERATION_TERMINATION_NOTIFICATION))
+#define LASSO_LIB_FEDERATION_TERMINATION_NOTIFICATION_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_FEDERATION_TERMINATION_NOTIFICATION, \
+				    LassoLibFederationTerminationNotificationClass)) 
 
-typedef struct _LassoLibFederationTerminationNotification LassoLibFederationTerminationNotification;
-typedef struct _LassoLibFederationTerminationNotificationClass LassoLibFederationTerminationNotificationClass;
+typedef struct _LassoLibFederationTerminationNotification \
+	LassoLibFederationTerminationNotification;
+typedef struct _LassoLibFederationTerminationNotificationClass \
+	LassoLibFederationTerminationNotificationClass;
 
 struct _LassoLibFederationTerminationNotification {
 	LassoSamlpRequestAbstract parent;
diff --git a/lasso/xml/lib_idp_entries.h b/lasso/xml/lib_idp_entries.h
index 9ae5453c..034b3fcc 100644
--- a/lasso/xml/lib_idp_entries.h
+++ b/lasso/xml/lib_idp_entries.h
@@ -34,11 +34,16 @@ extern "C" {
 #include <lasso/xml/lib_idp_entry.h>
 
 #define LASSO_TYPE_LIB_IDP_ENTRIES (lasso_lib_idp_entries_get_type())
-#define LASSO_LIB_IDP_ENTRIES(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_IDP_ENTRIES, LassoLibIDPEntries))
-#define LASSO_LIB_IDP_ENTRIES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_IDP_ENTRIES, LassoLibIDPEntriesClass))
-#define LASSO_IS_LIB_IDP_ENTRIES(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_IDP_ENTRIES))
-#define LASSO_IS_LIB_IDP_ENTRIES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_IDP_ENTRIES))
-#define LASSO_LIB_IDP_ENTRIES_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_IDP_ENTRIES, LassoLibIDPEntriesClass)) 
+#define LASSO_LIB_IDP_ENTRIES(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_IDP_ENTRIES, LassoLibIDPEntries))
+#define LASSO_LIB_IDP_ENTRIES_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_IDP_ENTRIES, LassoLibIDPEntriesClass))
+#define LASSO_IS_LIB_IDP_ENTRIES(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_IDP_ENTRIES))
+#define LASSO_IS_LIB_IDP_ENTRIES_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_IDP_ENTRIES))
+#define LASSO_LIB_IDP_ENTRIES_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_IDP_ENTRIES, LassoLibIDPEntriesClass)) 
 
 typedef struct _LassoLibIDPEntries LassoLibIDPEntries;
 typedef struct _LassoLibIDPEntriesClass LassoLibIDPEntriesClass;
diff --git a/lasso/xml/lib_idp_entry.h b/lasso/xml/lib_idp_entry.h
index b0ad2ce4..c438244f 100644
--- a/lasso/xml/lib_idp_entry.h
+++ b/lasso/xml/lib_idp_entry.h
@@ -33,11 +33,16 @@ extern "C" {
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_LIB_IDP_ENTRY (lasso_lib_idp_entry_get_type())
-#define LASSO_LIB_IDP_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_IDP_ENTRY, LassoLibIDPEntry))
-#define LASSO_LIB_IDP_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_IDP_ENTRY, LassoLibIDPEntryClass))
-#define LASSO_IS_LIB_IDP_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_IDP_ENTRY))
-#define LASSO_IS_LIB_IDP_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_IDP_ENTRY))
-#define LASSO_LIB_IDP_ENTRY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_IDP_ENTRY, LassoLibIDPEntryClass)) 
+#define LASSO_LIB_IDP_ENTRY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_IDP_ENTRY, LassoLibIDPEntry))
+#define LASSO_LIB_IDP_ENTRY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_IDP_ENTRY, LassoLibIDPEntryClass))
+#define LASSO_IS_LIB_IDP_ENTRY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_IDP_ENTRY))
+#define LASSO_IS_LIB_IDP_ENTRY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_IDP_ENTRY))
+#define LASSO_LIB_IDP_ENTRY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_IDP_ENTRY, LassoLibIDPEntryClass)) 
 
 typedef struct _LassoLibIDPEntry LassoLibIDPEntry;
 typedef struct _LassoLibIDPEntryClass LassoLibIDPEntryClass;
diff --git a/lasso/xml/lib_idp_list.h b/lasso/xml/lib_idp_list.h
index c658fc02..29f6830c 100644
--- a/lasso/xml/lib_idp_list.h
+++ b/lasso/xml/lib_idp_list.h
@@ -34,11 +34,15 @@ extern "C" {
 #include <lasso/xml/lib_idp_entries.h>
 
 #define LASSO_TYPE_LIB_IDP_LIST (lasso_lib_idp_list_get_type())
-#define LASSO_LIB_IDP_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_IDP_LIST, LassoLibIDPList))
-#define LASSO_LIB_IDP_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_IDP_LIST, LassoLibIDPListClass))
+#define LASSO_LIB_IDP_LIST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_IDP_LIST, LassoLibIDPList))
+#define LASSO_LIB_IDP_LIST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_IDP_LIST, LassoLibIDPListClass))
 #define LASSO_IS_LIB_IDP_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_IDP_LIST))
-#define LASSO_IS_LIB_IDP_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_IDP_LIST))
-#define LASSO_LIB_IDP_LIST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_IDP_LIST, LassoLibIDPListClass)) 
+#define LASSO_IS_LIB_IDP_LIST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_IDP_LIST))
+#define LASSO_LIB_IDP_LIST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_IDP_LIST, LassoLibIDPListClass)) 
 
 typedef struct _LassoLibIDPList LassoLibIDPList;
 typedef struct _LassoLibIDPListClass LassoLibIDPListClass;
diff --git a/lasso/xml/lib_logout_request.h b/lasso/xml/lib_logout_request.h
index 68a633ff..eb6069d1 100644
--- a/lasso/xml/lib_logout_request.h
+++ b/lasso/xml/lib_logout_request.h
@@ -34,11 +34,18 @@ extern "C" {
 #include <lasso/xml/saml_name_identifier.h>
 
 #define LASSO_TYPE_LIB_LOGOUT_REQUEST (lasso_lib_logout_request_get_type())
-#define LASSO_LIB_LOGOUT_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_LOGOUT_REQUEST, LassoLibLogoutRequest))
-#define LASSO_LIB_LOGOUT_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_LOGOUT_REQUEST, LassoLibLogoutRequestClass))
-#define LASSO_IS_LIB_LOGOUT_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_LOGOUT_REQUEST))
-#define LASSO_IS_LIB_LOGOUT_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_LOGOUT_REQUEST))
-#define LASSO_LIB_LOGOUT_REQUEST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_LOGOUT_REQUEST, LassoLibLogoutRequestClass)) 
+#define LASSO_LIB_LOGOUT_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_LOGOUT_REQUEST, LassoLibLogoutRequest))
+#define LASSO_LIB_LOGOUT_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_LOGOUT_REQUEST, \
+				 LassoLibLogoutRequestClass))
+#define LASSO_IS_LIB_LOGOUT_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_LOGOUT_REQUEST))
+#define LASSO_IS_LIB_LOGOUT_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_LOGOUT_REQUEST))
+#define LASSO_LIB_LOGOUT_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_LOGOUT_REQUEST, \
+				    LassoLibLogoutRequestClass)) 
 
 typedef struct _LassoLibLogoutRequest LassoLibLogoutRequest;
 typedef struct _LassoLibLogoutRequestClass LassoLibLogoutRequestClass;
diff --git a/lasso/xml/lib_logout_response.h b/lasso/xml/lib_logout_response.h
index c0b02b4e..d43dbf09 100644
--- a/lasso/xml/lib_logout_response.h
+++ b/lasso/xml/lib_logout_response.h
@@ -34,11 +34,18 @@ extern "C" {
 #include <lasso/xml/lib_logout_request.h>
 
 #define LASSO_TYPE_LIB_LOGOUT_RESPONSE (lasso_lib_logout_response_get_type())
-#define LASSO_LIB_LOGOUT_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_LOGOUT_RESPONSE, LassoLibLogoutResponse))
-#define LASSO_LIB_LOGOUT_RESPONSE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_LOGOUT_RESPONSE, LassoLibLogoutResponseClass))
-#define LASSO_IS_LIB_LOGOUT_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_LOGOUT_RESPONSE))
-#define LASSO_IS_LIB_LOGOUT_RESPONSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_LOGOUT_RESPONSE))
-#define LASSO_LIB_LOGOUT_RESPONSE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_LOGOUT_RESPONSE, LassoLibLogoutResponseClass)) 
+#define LASSO_LIB_LOGOUT_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_LOGOUT_RESPONSE, LassoLibLogoutResponse))
+#define LASSO_LIB_LOGOUT_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_LOGOUT_RESPONSE, \
+				 LassoLibLogoutResponseClass))
+#define LASSO_IS_LIB_LOGOUT_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_LOGOUT_RESPONSE))
+#define LASSO_IS_LIB_LOGOUT_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_LOGOUT_RESPONSE))
+#define LASSO_LIB_LOGOUT_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_LOGOUT_RESPONSE, \
+				    LassoLibLogoutResponseClass)) 
 
 typedef struct _LassoLibLogoutResponse LassoLibLogoutResponse;
 typedef struct _LassoLibLogoutResponseClass LassoLibLogoutResponseClass;
diff --git a/lasso/xml/lib_name_identifier_mapping_request.h b/lasso/xml/lib_name_identifier_mapping_request.h
index 14faf4a3..4b659d80 100644
--- a/lasso/xml/lib_name_identifier_mapping_request.h
+++ b/lasso/xml/lib_name_identifier_mapping_request.h
@@ -33,15 +33,25 @@ extern "C" {
 #include <lasso/xml/samlp_request_abstract.h>
 #include <lasso/xml/saml_name_identifier.h>
 
-#define LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_REQUEST (lasso_lib_name_identifier_mapping_request_get_type())
-#define LASSO_LIB_NAME_IDENTIFIER_MAPPING_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_REQUEST, LassoLibNameIdentifierMappingRequest))
-#define LASSO_LIB_NAME_IDENTIFIER_MAPPING_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_REQUEST, LassoLibNameIdentifierMappingRequestClass))
-#define LASSO_IS_LIB_NAME_IDENTIFIER_MAPPING_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_REQUEST))
-#define LASSO_IS_LIB_NAME_IDENTIFIER_MAPPING_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_REQUEST))
-#define LASSO_LIB_NAME_IDENTIFIER_MAPPING_REQUEST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_REQUEST, LassoLibNameIdentifierMappingRequestClass)) 
+#define LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_REQUEST \
+	(lasso_lib_name_identifier_mapping_request_get_type())
+#define LASSO_LIB_NAME_IDENTIFIER_MAPPING_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_REQUEST, \
+				    LassoLibNameIdentifierMappingRequest))
+#define LASSO_LIB_NAME_IDENTIFIER_MAPPING_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_REQUEST, \
+				 LassoLibNameIdentifierMappingRequestClass))
+#define LASSO_IS_LIB_NAME_IDENTIFIER_MAPPING_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_REQUEST))
+#define LASSO_IS_LIB_NAME_IDENTIFIER_MAPPING_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_REQUEST))
+#define LASSO_LIB_NAME_IDENTIFIER_MAPPING_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_REQUEST, \
+				    LassoLibNameIdentifierMappingRequestClass)) 
 
 typedef struct _LassoLibNameIdentifierMappingRequest LassoLibNameIdentifierMappingRequest;
-typedef struct _LassoLibNameIdentifierMappingRequestClass LassoLibNameIdentifierMappingRequestClass;
+typedef struct _LassoLibNameIdentifierMappingRequestClass \
+	LassoLibNameIdentifierMappingRequestClass;
 
 struct _LassoLibNameIdentifierMappingRequest {
 	LassoSamlpRequestAbstract parent;
diff --git a/lasso/xml/lib_name_identifier_mapping_response.h b/lasso/xml/lib_name_identifier_mapping_response.h
index 5a52dbca..09315f65 100644
--- a/lasso/xml/lib_name_identifier_mapping_response.h
+++ b/lasso/xml/lib_name_identifier_mapping_response.h
@@ -35,15 +35,25 @@ extern "C" {
 #include <lasso/xml/saml_name_identifier.h>
 #include <lasso/xml/lib_name_identifier_mapping_request.h>
 
-#define LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE (lasso_lib_name_identifier_mapping_response_get_type())
-#define LASSO_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE, LassoLibNameIdentifierMappingResponse))
-#define LASSO_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE, LassoLibNameIdentifierMappingResponseClass))
-#define LASSO_IS_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE))
-#define LASSO_IS_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE))
-#define LASSO_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE, LassoLibNameIdentifierMappingResponseClass)) 
+#define LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE \
+	(lasso_lib_name_identifier_mapping_response_get_type())
+#define LASSO_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE, \
+				    LassoLibNameIdentifierMappingResponse))
+#define LASSO_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE, \
+				 LassoLibNameIdentifierMappingResponseClass))
+#define LASSO_IS_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE))
+#define LASSO_IS_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE))
+#define LASSO_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_NAME_IDENTIFIER_MAPPING_RESPONSE, \
+				    LassoLibNameIdentifierMappingResponseClass)) 
 
 typedef struct _LassoLibNameIdentifierMappingResponse LassoLibNameIdentifierMappingResponse;
-typedef struct _LassoLibNameIdentifierMappingResponseClass LassoLibNameIdentifierMappingResponseClass;
+typedef struct _LassoLibNameIdentifierMappingResponseClass \
+	LassoLibNameIdentifierMappingResponseClass;
 
 struct _LassoLibNameIdentifierMappingResponse {
 	LassoSamlpResponseAbstract parent;
diff --git a/lasso/xml/lib_register_name_identifier_request.h b/lasso/xml/lib_register_name_identifier_request.h
index f2c8c486..ecda0c48 100644
--- a/lasso/xml/lib_register_name_identifier_request.h
+++ b/lasso/xml/lib_register_name_identifier_request.h
@@ -33,15 +33,25 @@ extern "C" {
 #include <lasso/xml/samlp_request_abstract.h>
 #include <lasso/xml/saml_name_identifier.h>
 
-#define LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_REQUEST (lasso_lib_register_name_identifier_request_get_type())
-#define LASSO_LIB_REGISTER_NAME_IDENTIFIER_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_REQUEST, LassoLibRegisterNameIdentifierRequest))
-#define LASSO_LIB_REGISTER_NAME_IDENTIFIER_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_REQUEST, LassoLibRegisterNameIdentifierRequestClass))
-#define LASSO_IS_LIB_REGISTER_NAME_IDENTIFIER_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_REQUEST))
-#define LASSO_IS_LIB_REGISTER_NAME_IDENTIFIER_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_REQUEST))
-#define LASSO_LIB_REGISTER_NAME_IDENTIFIER_REQUEST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_REQUEST, LassoLibRegisterNameIdentifierRequestClass)) 
+#define LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_REQUEST \
+	(lasso_lib_register_name_identifier_request_get_type())
+#define LASSO_LIB_REGISTER_NAME_IDENTIFIER_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_REQUEST, \
+				    LassoLibRegisterNameIdentifierRequest))
+#define LASSO_LIB_REGISTER_NAME_IDENTIFIER_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_REQUEST, \
+				 LassoLibRegisterNameIdentifierRequestClass))
+#define LASSO_IS_LIB_REGISTER_NAME_IDENTIFIER_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_REQUEST))
+#define LASSO_IS_LIB_REGISTER_NAME_IDENTIFIER_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_REQUEST))
+#define LASSO_LIB_REGISTER_NAME_IDENTIFIER_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_REQUEST, \
+				    LassoLibRegisterNameIdentifierRequestClass)) 
 
 typedef struct _LassoLibRegisterNameIdentifierRequest LassoLibRegisterNameIdentifierRequest;
-typedef struct _LassoLibRegisterNameIdentifierRequestClass LassoLibRegisterNameIdentifierRequestClass;
+typedef struct _LassoLibRegisterNameIdentifierRequestClass \
+	LassoLibRegisterNameIdentifierRequestClass;
 
 struct _LassoLibRegisterNameIdentifierRequest {
 	LassoSamlpRequestAbstract parent;
diff --git a/lasso/xml/lib_register_name_identifier_response.h b/lasso/xml/lib_register_name_identifier_response.h
index 57e4cc86..3cf8ad92 100644
--- a/lasso/xml/lib_register_name_identifier_response.h
+++ b/lasso/xml/lib_register_name_identifier_response.h
@@ -33,15 +33,25 @@ extern "C" {
 #include <lasso/xml/lib_register_name_identifier_request.h>
 #include <lasso/xml/lib_status_response.h>
 
-#define LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE (lasso_lib_register_name_identifier_response_get_type())
-#define LASSO_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE, LassoLibRegisterNameIdentifierResponse))
-#define LASSO_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE, LassoLibRegisterNameIdentifierResponseClass))
-#define LASSO_IS_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE))
-#define LASSO_IS_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE))
-#define LASSO_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE, LassoLibRegisterNameIdentifierResponseClass)) 
+#define LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE \
+	(lasso_lib_register_name_identifier_response_get_type())
+#define LASSO_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE, \
+				    LassoLibRegisterNameIdentifierResponse))
+#define LASSO_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE, \
+				 LassoLibRegisterNameIdentifierResponseClass))
+#define LASSO_IS_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+			LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE))
+#define LASSO_IS_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE))
+#define LASSO_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_REGISTER_NAME_IDENTIFIER_RESPONSE, \
+				    LassoLibRegisterNameIdentifierResponseClass)) 
 
 typedef struct _LassoLibRegisterNameIdentifierResponse LassoLibRegisterNameIdentifierResponse;
-typedef struct _LassoLibRegisterNameIdentifierResponseClass LassoLibRegisterNameIdentifierResponseClass;
+typedef struct _LassoLibRegisterNameIdentifierResponseClass \
+	LassoLibRegisterNameIdentifierResponseClass;
 
 struct _LassoLibRegisterNameIdentifierResponse {
 	LassoLibStatusResponse parent;
diff --git a/lasso/xml/lib_request_authn_context.h b/lasso/xml/lib_request_authn_context.h
index 4331e948..bb1f493c 100644
--- a/lasso/xml/lib_request_authn_context.h
+++ b/lasso/xml/lib_request_authn_context.h
@@ -33,11 +33,19 @@ extern "C" {
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_LIB_REQUEST_AUTHN_CONTEXT (lasso_lib_request_authn_context_get_type())
-#define LASSO_LIB_REQUEST_AUTHN_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_REQUEST_AUTHN_CONTEXT, LassoLibRequestAuthnContext))
-#define LASSO_LIB_REQUEST_AUTHN_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_REQUEST_AUTHN_CONTEXT, LassoLibRequestAuthnContextClass))
-#define LASSO_IS_LIB_REQUEST_AUTHN_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_REQUEST_AUTHN_CONTEXT))
-#define LASSO_IS_LIB_REQUEST_AUTHN_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_REQUEST_AUTHN_CONTEXT))
-#define LASSO_LIB_REQUEST_AUTHN_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_REQUEST_AUTHN_CONTEXT, LassoLibRequestAuthnContextClass)) 
+#define LASSO_LIB_REQUEST_AUTHN_CONTEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_REQUEST_AUTHN_CONTEXT, \
+				    LassoLibRequestAuthnContext))
+#define LASSO_LIB_REQUEST_AUTHN_CONTEXT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_REQUEST_AUTHN_CONTEXT, \
+				 LassoLibRequestAuthnContextClass))
+#define LASSO_IS_LIB_REQUEST_AUTHN_CONTEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_REQUEST_AUTHN_CONTEXT))
+#define LASSO_IS_LIB_REQUEST_AUTHN_CONTEXT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_REQUEST_AUTHN_CONTEXT))
+#define LASSO_LIB_REQUEST_AUTHN_CONTEXT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_REQUEST_AUTHN_CONTEXT, \
+				    LassoLibRequestAuthnContextClass)) 
 
 typedef struct _LassoLibRequestAuthnContext LassoLibRequestAuthnContext;
 typedef struct _LassoLibRequestAuthnContextClass LassoLibRequestAuthnContextClass;
diff --git a/lasso/xml/lib_scoping.h b/lasso/xml/lib_scoping.h
index 1824ae8f..d4f2c591 100644
--- a/lasso/xml/lib_scoping.h
+++ b/lasso/xml/lib_scoping.h
@@ -34,11 +34,16 @@ extern "C" {
 #include <lasso/xml/lib_idp_list.h>
 
 #define LASSO_TYPE_LIB_SCOPING (lasso_lib_scoping_get_type())
-#define LASSO_LIB_SCOPING(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_SCOPING, LassoLibScoping))
-#define LASSO_LIB_SCOPING_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_SCOPING, LassoLibScopingClass))
-#define LASSO_IS_LIB_SCOPING(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_SCOPING))
-#define LASSO_IS_LIB_SCOPING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_SCOPING))
-#define LASSO_LIB_SCOPING_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_SCOPING, LassoLibScopingClass)) 
+#define LASSO_LIB_SCOPING(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_SCOPING, LassoLibScoping))
+#define LASSO_LIB_SCOPING_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_SCOPING, LassoLibScopingClass))
+#define LASSO_IS_LIB_SCOPING(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_SCOPING))
+#define LASSO_IS_LIB_SCOPING_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_SCOPING))
+#define LASSO_LIB_SCOPING_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_SCOPING, LassoLibScopingClass)) 
 
 typedef struct _LassoLibScoping LassoLibScoping;
 typedef struct _LassoLibScopingClass LassoLibScopingClass;
diff --git a/lasso/xml/lib_status_response.h b/lasso/xml/lib_status_response.h
index 5bac05e7..512a496a 100644
--- a/lasso/xml/lib_status_response.h
+++ b/lasso/xml/lib_status_response.h
@@ -34,11 +34,18 @@ extern "C" {
 #include <lasso/xml/samlp_status.h>
 
 #define LASSO_TYPE_LIB_STATUS_RESPONSE (lasso_lib_status_response_get_type())
-#define LASSO_LIB_STATUS_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_STATUS_RESPONSE, LassoLibStatusResponse))
-#define LASSO_LIB_STATUS_RESPONSE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_STATUS_RESPONSE, LassoLibStatusResponseClass))
-#define LASSO_IS_LIB_STATUS_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_STATUS_RESPONSE))
-#define LASSO_IS_LIB_STATUS_RESPONSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_STATUS_RESPONSE))
-#define LASSO_LIB_STATUS_RESPONSE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_STATUS_RESPONSE, LassoLibStatusResponseClass)) 
+#define LASSO_LIB_STATUS_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_STATUS_RESPONSE, LassoLibStatusResponse))
+#define LASSO_LIB_STATUS_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_STATUS_RESPONSE, \
+				 LassoLibStatusResponseClass))
+#define LASSO_IS_LIB_STATUS_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_STATUS_RESPONSE))
+#define LASSO_IS_LIB_STATUS_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_STATUS_RESPONSE))
+#define LASSO_LIB_STATUS_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_STATUS_RESPONSE, \
+				    LassoLibStatusResponseClass)) 
 
 typedef struct _LassoLibStatusResponse LassoLibStatusResponse;
 typedef struct _LassoLibStatusResponseClass LassoLibStatusResponseClass;
diff --git a/lasso/xml/lib_subject.h b/lasso/xml/lib_subject.h
index e58ed422..1cff67fc 100644
--- a/lasso/xml/lib_subject.h
+++ b/lasso/xml/lib_subject.h
@@ -34,11 +34,15 @@ extern "C" {
 #include <lasso/xml/saml_name_identifier.h>
 
 #define LASSO_TYPE_LIB_SUBJECT (lasso_lib_subject_get_type())
-#define LASSO_LIB_SUBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_SUBJECT, LassoLibSubject))
-#define LASSO_LIB_SUBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_SUBJECT, LassoLibSubjectClass))
+#define LASSO_LIB_SUBJECT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_LIB_SUBJECT, LassoLibSubject))
+#define LASSO_LIB_SUBJECT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_LIB_SUBJECT, LassoLibSubjectClass))
 #define LASSO_IS_LIB_SUBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_LIB_SUBJECT))
-#define LASSO_IS_LIB_SUBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_SUBJECT))
-#define LASSO_LIB_SUBJECT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_SUBJECT, LassoLibSubjectClass)) 
+#define LASSO_IS_LIB_SUBJECT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_LIB_SUBJECT))
+#define LASSO_LIB_SUBJECT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_LIB_SUBJECT, LassoLibSubjectClass)) 
 
 typedef struct _LassoLibSubject LassoLibSubject;
 typedef struct _LassoLibSubjectClass LassoLibSubjectClass;
diff --git a/lasso/xml/saml_advice.h b/lasso/xml/saml_advice.h
index 66a81826..acceb33f 100644
--- a/lasso/xml/saml_advice.h
+++ b/lasso/xml/saml_advice.h
@@ -33,11 +33,15 @@ extern "C" {
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_SAML_ADVICE (lasso_saml_advice_get_type())
-#define LASSO_SAML_ADVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_ADVICE, LassoSamlAdvice))
-#define LASSO_SAML_ADVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_ADVICE, LassoSamlAdviceClass))
+#define LASSO_SAML_ADVICE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_ADVICE, LassoSamlAdvice))
+#define LASSO_SAML_ADVICE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_ADVICE, LassoSamlAdviceClass))
 #define LASSO_IS_SAML_ADVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_ADVICE))
-#define LASSO_IS_SAML_ADVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_ADVICE))
-#define LASSO_SAML_ADVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_ADVICE, LassoSamlAdviceClass)) 
+#define LASSO_IS_SAML_ADVICE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_ADVICE))
+#define LASSO_SAML_ADVICE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_ADVICE, LassoSamlAdviceClass)) 
 
 typedef struct _LassoSamlAdvice LassoSamlAdvice;
 typedef struct _LassoSamlAdviceClass LassoSamlAdviceClass;
diff --git a/lasso/xml/saml_assertion.h b/lasso/xml/saml_assertion.h
index 73b518db..62b9bc50 100644
--- a/lasso/xml/saml_assertion.h
+++ b/lasso/xml/saml_assertion.h
@@ -38,11 +38,16 @@ extern "C" {
 #include <lasso/xml/saml_subject_statement.h>
 
 #define LASSO_TYPE_SAML_ASSERTION (lasso_saml_assertion_get_type())
-#define LASSO_SAML_ASSERTION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_ASSERTION, LassoSamlAssertion))
-#define LASSO_SAML_ASSERTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_ASSERTION, LassoSamlAssertionClass))
-#define LASSO_IS_SAML_ASSERTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_ASSERTION))
-#define LASSO_IS_SAML_ASSERTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_ASSERTION))
-#define LASSO_SAML_ASSERTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_ASSERTION, LassoSamlAssertionClass)) 
+#define LASSO_SAML_ASSERTION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_ASSERTION, LassoSamlAssertion))
+#define LASSO_SAML_ASSERTION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_ASSERTION, LassoSamlAssertionClass))
+#define LASSO_IS_SAML_ASSERTION(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_ASSERTION))
+#define LASSO_IS_SAML_ASSERTION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_ASSERTION))
+#define LASSO_SAML_ASSERTION_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_ASSERTION, LassoSamlAssertionClass)) 
 
 typedef struct _LassoSamlAssertion LassoSamlAssertion;
 typedef struct _LassoSamlAssertionClass LassoSamlAssertionClass;
diff --git a/lasso/xml/saml_audience_restriction_condition.h b/lasso/xml/saml_audience_restriction_condition.h
index ab3d76c5..ac107dc9 100644
--- a/lasso/xml/saml_audience_restriction_condition.h
+++ b/lasso/xml/saml_audience_restriction_condition.h
@@ -32,15 +32,25 @@ extern "C" {
 
 #include <lasso/xml/saml_condition_abstract.h>
 
-#define LASSO_TYPE_SAML_AUDIENCE_RESTRICTION_CONDITION (lasso_saml_audience_restriction_condition_get_type())
-#define LASSO_SAML_AUDIENCE_RESTRICTION_CONDITION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_AUDIENCE_RESTRICTION_CONDITION, LassoSamlAudienceRestrictionCondition))
-#define LASSO_SAML_AUDIENCE_RESTRICTION_CONDITION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_AUDIENCE_RESTRICTION_CONDITION, LassoSamlAudienceRestrictionConditionClass))
-#define LASSO_IS_SAML_AUDIENCE_RESTRICTION_CONDITION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_AUDIENCE_RESTRICTION_CONDITION))
-#define LASSO_IS_SAML_AUDIENCE_RESTRICTION_CONDITION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_AUDIENCE_RESTRICTION_CONDITION))
-#define LASSO_SAML_AUDIENCE_RESTRICTION_CONDITION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_AUDIENCE_RESTRICTION_CONDITION, LassoSamlAudienceRestrictionConditionClass)) 
+#define LASSO_TYPE_SAML_AUDIENCE_RESTRICTION_CONDITION \
+	(lasso_saml_audience_restriction_condition_get_type())
+#define LASSO_SAML_AUDIENCE_RESTRICTION_CONDITION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_AUDIENCE_RESTRICTION_CONDITION,\
+				    LassoSamlAudienceRestrictionCondition))
+#define LASSO_SAML_AUDIENCE_RESTRICTION_CONDITION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_AUDIENCE_RESTRICTION_CONDITION, \
+				 LassoSamlAudienceRestrictionConditionClass))
+#define LASSO_IS_SAML_AUDIENCE_RESTRICTION_CONDITION(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_AUDIENCE_RESTRICTION_CONDITION))
+#define LASSO_IS_SAML_AUDIENCE_RESTRICTION_CONDITION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_AUDIENCE_RESTRICTION_CONDITION))
+#define LASSO_SAML_AUDIENCE_RESTRICTION_CONDITION_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_AUDIENCE_RESTRICTION_CONDITION, \
+				    LassoSamlAudienceRestrictionConditionClass)) 
 
 typedef struct _LassoSamlAudienceRestrictionCondition LassoSamlAudienceRestrictionCondition;
-typedef struct _LassoSamlAudienceRestrictionConditionClass LassoSamlAudienceRestrictionConditionClass;
+typedef struct _LassoSamlAudienceRestrictionConditionClass \
+	LassoSamlAudienceRestrictionConditionClass;
 
 struct _LassoSamlAudienceRestrictionCondition {
 	LassoSamlConditionAbstract parent;
diff --git a/lasso/xml/saml_authentication_statement.h b/lasso/xml/saml_authentication_statement.h
index 94d3c6a6..95c2afd0 100644
--- a/lasso/xml/saml_authentication_statement.h
+++ b/lasso/xml/saml_authentication_statement.h
@@ -35,11 +35,19 @@ extern "C" {
 #include <lasso/xml/saml_subject_statement_abstract.h>
 
 #define LASSO_TYPE_SAML_AUTHENTICATION_STATEMENT (lasso_saml_authentication_statement_get_type())
-#define LASSO_SAML_AUTHENTICATION_STATEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_AUTHENTICATION_STATEMENT, LassoSamlAuthenticationStatement))
-#define LASSO_SAML_AUTHENTICATION_STATEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_AUTHENTICATION_STATEMENT, LassoSamlAuthenticationStatementClass))
-#define LASSO_IS_SAML_AUTHENTICATION_STATEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_AUTHENTICATION_STATEMENT))
-#define LASSO_IS_SAML_AUTHENTICATION_STATEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_AUTHENTICATION_STATEMENT))
-#define LASSO_SAML_AUTHENTICATION_STATEMENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_AUTHENTICATION_STATEMENT, LassoSamlAuthenticationStatementClass)) 
+#define LASSO_SAML_AUTHENTICATION_STATEMENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_AUTHENTICATION_STATEMENT,\
+				    LassoSamlAuthenticationStatement))
+#define LASSO_SAML_AUTHENTICATION_STATEMENT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_AUTHENTICATION_STATEMENT, \
+				 LassoSamlAuthenticationStatementClass))
+#define LASSO_IS_SAML_AUTHENTICATION_STATEMENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_AUTHENTICATION_STATEMENT))
+#define LASSO_IS_SAML_AUTHENTICATION_STATEMENT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_AUTHENTICATION_STATEMENT))
+#define LASSO_SAML_AUTHENTICATION_STATEMENT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_AUTHENTICATION_STATEMENT, \
+				    LassoSamlAuthenticationStatementClass)) 
 
 typedef struct _LassoSamlAuthenticationStatement LassoSamlAuthenticationStatement;
 typedef struct _LassoSamlAuthenticationStatementClass LassoSamlAuthenticationStatementClass;
diff --git a/lasso/xml/saml_authority_binding.h b/lasso/xml/saml_authority_binding.h
index 3bcb8a52..065d570e 100644
--- a/lasso/xml/saml_authority_binding.h
+++ b/lasso/xml/saml_authority_binding.h
@@ -33,11 +33,19 @@ extern "C" {
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_SAML_AUTHORITY_BINDING (lasso_saml_authority_binding_get_type())
-#define LASSO_SAML_AUTHORITY_BINDING(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_AUTHORITY_BINDING, LassoSamlAuthorityBinding))
-#define LASSO_SAML_AUTHORITY_BINDING_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_AUTHORITY_BINDING, LassoSamlAuthorityBindingClass))
-#define LASSO_IS_SAML_AUTHORITY_BINDING(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_AUTHORITY_BINDING))
-#define LASSO_IS_SAML_AUTHORITY_BINDING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_AUTHORITY_BINDING))
-#define LASSO_SAML_AUTHORITY_BINDING_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_AUTHORITY_BINDING, LassoSamlAuthorityBindingClass)) 
+#define LASSO_SAML_AUTHORITY_BINDING(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_AUTHORITY_BINDING, \
+				    LassoSamlAuthorityBinding))
+#define LASSO_SAML_AUTHORITY_BINDING_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_AUTHORITY_BINDING, \
+				 LassoSamlAuthorityBindingClass))
+#define LASSO_IS_SAML_AUTHORITY_BINDING(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_AUTHORITY_BINDING))
+#define LASSO_IS_SAML_AUTHORITY_BINDING_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_AUTHORITY_BINDING))
+#define LASSO_SAML_AUTHORITY_BINDING_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_AUTHORITY_BINDING, \
+				    LassoSamlAuthorityBindingClass)) 
 
 typedef struct _LassoSamlAuthorityBinding LassoSamlAuthorityBinding;
 typedef struct _LassoSamlAuthorityBindingClass LassoSamlAuthorityBindingClass;
diff --git a/lasso/xml/saml_condition_abstract.h b/lasso/xml/saml_condition_abstract.h
index be51c852..de74dd98 100644
--- a/lasso/xml/saml_condition_abstract.h
+++ b/lasso/xml/saml_condition_abstract.h
@@ -33,11 +33,19 @@ extern "C" {
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_SAML_CONDITION_ABSTRACT (lasso_saml_condition_abstract_get_type())
-#define LASSO_SAML_CONDITION_ABSTRACT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_CONDITION_ABSTRACT, LassoSamlConditionAbstract))
-#define LASSO_SAML_CONDITION_ABSTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_CONDITION_ABSTRACT, LassoSamlConditionAbstractClass))
-#define LASSO_IS_SAML_CONDITION_ABSTRACT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_CONDITION_ABSTRACT))
-#define LASSO_IS_SAML_CONDITION_ABSTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_CONDITION_ABSTRACT))
-#define LASSO_SAML_CONDITION_ABSTRACT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_CONDITION_ABSTRACT, LassoSamlConditionAbstractClass)) 
+#define LASSO_SAML_CONDITION_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_CONDITION_ABSTRACT, \
+				    LassoSamlConditionAbstract))
+#define LASSO_SAML_CONDITION_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_CONDITION_ABSTRACT, \
+				 LassoSamlConditionAbstractClass))
+#define LASSO_IS_SAML_CONDITION_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_CONDITION_ABSTRACT))
+#define LASSO_IS_SAML_CONDITION_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_CONDITION_ABSTRACT))
+#define LASSO_SAML_CONDITION_ABSTRACT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_CONDITION_ABSTRACT, \
+				    LassoSamlConditionAbstractClass)) 
 
 typedef struct _LassoSamlConditionAbstract LassoSamlConditionAbstract;
 typedef struct _LassoSamlConditionAbstractClass LassoSamlConditionAbstractClass;
diff --git a/lasso/xml/saml_conditions.h b/lasso/xml/saml_conditions.h
index 8e9e1e54..813ae0c6 100644
--- a/lasso/xml/saml_conditions.h
+++ b/lasso/xml/saml_conditions.h
@@ -35,11 +35,16 @@ extern "C" {
 #include <lasso/xml/saml_condition_abstract.h>
 
 #define LASSO_TYPE_SAML_CONDITIONS (lasso_saml_conditions_get_type())
-#define LASSO_SAML_CONDITIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_CONDITIONS, LassoSamlConditions))
-#define LASSO_SAML_CONDITIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_CONDITIONS, LassoSamlConditionsClass))
-#define LASSO_IS_SAML_CONDITIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_CONDITIONS))
-#define LASSO_IS_SAML_CONDITIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_CONDITIONS))
-#define LASSO_SAML_CONDITIONS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_CONDITIONS, LassoSamlConditionsClass)) 
+#define LASSO_SAML_CONDITIONS(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_CONDITIONS, LassoSamlConditions))
+#define LASSO_SAML_CONDITIONS_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_CONDITIONS, LassoSamlConditionsClass))
+#define LASSO_IS_SAML_CONDITIONS(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_CONDITIONS))
+#define LASSO_IS_SAML_CONDITIONS_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_CONDITIONS))
+#define LASSO_SAML_CONDITIONS_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_CONDITIONS, LassoSamlConditionsClass)) 
 
 typedef struct _LassoSamlConditions LassoSamlConditions;
 typedef struct _LassoSamlConditionsClass LassoSamlConditionsClass;
diff --git a/lasso/xml/saml_name_identifier.h b/lasso/xml/saml_name_identifier.h
index 30d9cf51..287b3e63 100644
--- a/lasso/xml/saml_name_identifier.h
+++ b/lasso/xml/saml_name_identifier.h
@@ -33,11 +33,19 @@ extern "C" {
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_SAML_NAME_IDENTIFIER (lasso_saml_name_identifier_get_type())
-#define LASSO_SAML_NAME_IDENTIFIER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_NAME_IDENTIFIER, LassoSamlNameIdentifier))
-#define LASSO_SAML_NAME_IDENTIFIER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_NAME_IDENTIFIER, LassoSamlNameIdentifierClass))
-#define LASSO_IS_SAML_NAME_IDENTIFIER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_NAME_IDENTIFIER))
-#define LASSO_IS_SAML_NAME_IDENTIFIER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_NAME_IDENTIFIER))
-#define LASSO_SAML_NAME_IDENTIFIER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_NAME_IDENTIFIER, LassoSamlNameIdentifierClass)) 
+#define LASSO_SAML_NAME_IDENTIFIER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_NAME_IDENTIFIER, \
+				    LassoSamlNameIdentifier))
+#define LASSO_SAML_NAME_IDENTIFIER_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_NAME_IDENTIFIER, \
+				 LassoSamlNameIdentifierClass))
+#define LASSO_IS_SAML_NAME_IDENTIFIER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_NAME_IDENTIFIER))
+#define LASSO_IS_SAML_NAME_IDENTIFIER_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_NAME_IDENTIFIER))
+#define LASSO_SAML_NAME_IDENTIFIER_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_NAME_IDENTIFIER, \
+				    LassoSamlNameIdentifierClass)) 
 
 typedef struct _LassoSamlNameIdentifier LassoSamlNameIdentifier;
 typedef struct _LassoSamlNameIdentifierClass LassoSamlNameIdentifierClass;
diff --git a/lasso/xml/saml_statement_abstract.h b/lasso/xml/saml_statement_abstract.h
index 2f65c83a..946e620f 100644
--- a/lasso/xml/saml_statement_abstract.h
+++ b/lasso/xml/saml_statement_abstract.h
@@ -33,11 +33,19 @@ extern "C" {
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_SAML_STATEMENT_ABSTRACT (lasso_saml_statement_abstract_get_type())
-#define LASSO_SAML_STATEMENT_ABSTRACT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_STATEMENT_ABSTRACT, LassoSamlStatementAbstract))
-#define LASSO_SAML_STATEMENT_ABSTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_STATEMENT_ABSTRACT, LassoSamlStatementAbstractClass))
-#define LASSO_IS_SAML_STATEMENT_ABSTRACT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_STATEMENT_ABSTRACT))
-#define LASSO_IS_SAML_STATEMENT_ABSTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_STATEMENT_ABSTRACT))
-#define LASSO_SAML_STATEMENT_ABSTRACT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_STATEMENT_ABSTRACT, LassoSamlStatementAbstractClass)) 
+#define LASSO_SAML_STATEMENT_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_STATEMENT_ABSTRACT, \
+				    LassoSamlStatementAbstract))
+#define LASSO_SAML_STATEMENT_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_STATEMENT_ABSTRACT, \
+				 LassoSamlStatementAbstractClass))
+#define LASSO_IS_SAML_STATEMENT_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_STATEMENT_ABSTRACT))
+#define LASSO_IS_SAML_STATEMENT_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_STATEMENT_ABSTRACT))
+#define LASSO_SAML_STATEMENT_ABSTRACT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_STATEMENT_ABSTRACT, \
+				    LassoSamlStatementAbstractClass)) 
 
 typedef struct _LassoSamlStatementAbstract LassoSamlStatementAbstract;
 typedef struct _LassoSamlStatementAbstractClass LassoSamlStatementAbstractClass;
diff --git a/lasso/xml/saml_subject.h b/lasso/xml/saml_subject.h
index 390293d1..227eb80d 100644
--- a/lasso/xml/saml_subject.h
+++ b/lasso/xml/saml_subject.h
@@ -35,11 +35,15 @@ extern "C" {
 #include <lasso/xml/saml_subject_confirmation.h>
 
 #define LASSO_TYPE_SAML_SUBJECT (lasso_saml_subject_get_type())
-#define LASSO_SAML_SUBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_SUBJECT, LassoSamlSubject))
-#define LASSO_SAML_SUBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_SUBJECT, LassoSamlSubjectClass))
+#define LASSO_SAML_SUBJECT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_SUBJECT, LassoSamlSubject))
+#define LASSO_SAML_SUBJECT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_SUBJECT, LassoSamlSubjectClass))
 #define LASSO_IS_SAML_SUBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_SUBJECT))
-#define LASSO_IS_SAML_SUBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_SUBJECT))
-#define LASSO_SAML_SUBJECT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_SUBJECT, LassoSamlSubjectClass)) 
+#define LASSO_IS_SAML_SUBJECT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_SUBJECT))
+#define LASSO_SAML_SUBJECT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_SUBJECT, LassoSamlSubjectClass)) 
 
 typedef struct _LassoSamlSubject LassoSamlSubject;
 typedef struct _LassoSamlSubjectClass LassoSamlSubjectClass;
diff --git a/lasso/xml/saml_subject_confirmation.h b/lasso/xml/saml_subject_confirmation.h
index e79451e1..6893b8a3 100644
--- a/lasso/xml/saml_subject_confirmation.h
+++ b/lasso/xml/saml_subject_confirmation.h
@@ -33,11 +33,19 @@ extern "C" {
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_SAML_SUBJECT_CONFIRMATION (lasso_saml_subject_confirmation_get_type())
-#define LASSO_SAML_SUBJECT_CONFIRMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_SUBJECT_CONFIRMATION, LassoSamlSubjectConfirmation))
-#define LASSO_SAML_SUBJECT_CONFIRMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_SUBJECT_CONFIRMATION, LassoSamlSubjectConfirmationClass))
-#define LASSO_IS_SAML_SUBJECT_CONFIRMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_SUBJECT_CONFIRMATION))
-#define LASSO_IS_SAML_SUBJECT_CONFIRMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_SUBJECT_CONFIRMATION))
-#define LASSO_SAML_SUBJECT_CONFIRMATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_SUBJECT_CONFIRMATION, LassoSamlSubjectConfirmationClass)) 
+#define LASSO_SAML_SUBJECT_CONFIRMATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_SUBJECT_CONFIRMATION, \
+				    LassoSamlSubjectConfirmation))
+#define LASSO_SAML_SUBJECT_CONFIRMATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_SUBJECT_CONFIRMATION, \
+				 LassoSamlSubjectConfirmationClass))
+#define LASSO_IS_SAML_SUBJECT_CONFIRMATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_SUBJECT_CONFIRMATION))
+#define LASSO_IS_SAML_SUBJECT_CONFIRMATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_SUBJECT_CONFIRMATION))
+#define LASSO_SAML_SUBJECT_CONFIRMATION_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_SUBJECT_CONFIRMATION, \
+				    LassoSamlSubjectConfirmationClass)) 
 
 typedef struct _LassoSamlSubjectConfirmation LassoSamlSubjectConfirmation;
 typedef struct _LassoSamlSubjectConfirmationClass LassoSamlSubjectConfirmationClass;
diff --git a/lasso/xml/saml_subject_locality.h b/lasso/xml/saml_subject_locality.h
index e0bbf91d..3c72a45f 100644
--- a/lasso/xml/saml_subject_locality.h
+++ b/lasso/xml/saml_subject_locality.h
@@ -33,11 +33,19 @@ extern "C" {
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_SAML_SUBJECT_LOCALITY (lasso_saml_subject_locality_get_type())
-#define LASSO_SAML_SUBJECT_LOCALITY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_SUBJECT_LOCALITY, LassoSamlSubjectLocality))
-#define LASSO_SAML_SUBJECT_LOCALITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_SUBJECT_LOCALITY, LassoSamlSubjectLocalityClass))
-#define LASSO_IS_SAML_SUBJECT_LOCALITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_SUBJECT_LOCALITY))
-#define LASSO_IS_SAML_SUBJECT_LOCALITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_SUBJECT_LOCALITY))
-#define LASSO_SAML_SUBJECT_LOCALITY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_SUBJECT_LOCALITY, LassoSamlSubjectLocalityClass)) 
+#define LASSO_SAML_SUBJECT_LOCALITY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_SUBJECT_LOCALITY, \
+				    LassoSamlSubjectLocality))
+#define LASSO_SAML_SUBJECT_LOCALITY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_SUBJECT_LOCALITY, \
+				 LassoSamlSubjectLocalityClass))
+#define LASSO_IS_SAML_SUBJECT_LOCALITY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_SUBJECT_LOCALITY))
+#define LASSO_IS_SAML_SUBJECT_LOCALITY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_SUBJECT_LOCALITY))
+#define LASSO_SAML_SUBJECT_LOCALITY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_SUBJECT_LOCALITY, \
+				    LassoSamlSubjectLocalityClass)) 
 
 typedef struct _LassoSamlSubjectLocality LassoSamlSubjectLocality;
 typedef struct _LassoSamlSubjectLocalityClass LassoSamlSubjectLocalityClass;
diff --git a/lasso/xml/saml_subject_statement.h b/lasso/xml/saml_subject_statement.h
index f9b3f295..05caa4ee 100644
--- a/lasso/xml/saml_subject_statement.h
+++ b/lasso/xml/saml_subject_statement.h
@@ -33,11 +33,19 @@ extern "C" {
 #include <lasso/xml/saml_subject_statement_abstract.h>
 
 #define LASSO_TYPE_SAML_SUBJECT_STATEMENT (lasso_saml_subject_statement_abstract_get_type())
-#define LASSO_SAML_SUBJECT_STATEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_SUBJECT_STATEMENT, LassoSamlSubjectStatement))
-#define LASSO_SAML_SUBJECT_STATEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_SUBJECT_STATEMENT, LassoSamlSubjectStatementClass))
-#define LASSO_IS_SAML_SUBJECT_STATEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_SUBJECT_STATEMENT))
-#define LASSO_IS_SAML_SUBJECT_STATEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_SUBJECT_STATEMENT))
-#define LASSO_SAML_SUBJECT_STATEMENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_SUBJECT_STATEMENT, LassoSamlSubjectStatementClass)) 
+#define LASSO_SAML_SUBJECT_STATEMENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_SUBJECT_STATEMENT, \
+				    LassoSamlSubjectStatement))
+#define LASSO_SAML_SUBJECT_STATEMENT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_SUBJECT_STATEMENT, \
+				 LassoSamlSubjectStatementClass))
+#define LASSO_IS_SAML_SUBJECT_STATEMENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_SUBJECT_STATEMENT))
+#define LASSO_IS_SAML_SUBJECT_STATEMENT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_SUBJECT_STATEMENT))
+#define LASSO_SAML_SUBJECT_STATEMENT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_SUBJECT_STATEMENT, \
+				    LassoSamlSubjectStatementClass)) 
 
 typedef struct _LassoSamlSubjectStatement LassoSamlSubjectStatement;
 typedef struct _LassoSamlSubjectStatementClass LassoSamlSubjectStatementClass;
diff --git a/lasso/xml/saml_subject_statement_abstract.h b/lasso/xml/saml_subject_statement_abstract.h
index 2f3fd64d..b53c7dc5 100644
--- a/lasso/xml/saml_subject_statement_abstract.h
+++ b/lasso/xml/saml_subject_statement_abstract.h
@@ -33,12 +33,21 @@ extern "C" {
 #include <lasso/xml/saml_statement_abstract.h>
 #include <lasso/xml/saml_subject.h>
 
-#define LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT (lasso_saml_subject_statement_abstract_get_type())
-#define LASSO_SAML_SUBJECT_STATEMENT_ABSTRACT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT, LassoSamlSubjectStatementAbstract))
-#define LASSO_SAML_SUBJECT_STATEMENT_ABSTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT, LassoSamlSubjectStatementAbstractClass))
-#define LASSO_IS_SAML_SUBJECT_STATEMENT_ABSTRACT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT))
-#define LASSO_IS_SAML_SUBJECT_STATEMENT_ABSTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT))
-#define LASSO_SAML_SUBJECT_STATEMENT_ABSTRACT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT, LassoSamlSubjectStatementAbstractClass)) 
+#define LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT \
+	(lasso_saml_subject_statement_abstract_get_type())
+#define LASSO_SAML_SUBJECT_STATEMENT_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT, \
+				    LassoSamlSubjectStatementAbstract))
+#define LASSO_SAML_SUBJECT_STATEMENT_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT, \
+				 LassoSamlSubjectStatementAbstractClass))
+#define LASSO_IS_SAML_SUBJECT_STATEMENT_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT))
+#define LASSO_IS_SAML_SUBJECT_STATEMENT_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT))
+#define LASSO_SAML_SUBJECT_STATEMENT_ABSTRACT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT, \
+				    LassoSamlSubjectStatementAbstractClass)) 
 
 typedef struct _LassoSamlSubjectStatementAbstract LassoSamlSubjectStatementAbstract;
 typedef struct _LassoSamlSubjectStatementAbstractClass LassoSamlSubjectStatementAbstractClass;
diff --git a/lasso/xml/samlp_request.h b/lasso/xml/samlp_request.h
index 3979160e..a2239b26 100644
--- a/lasso/xml/samlp_request.h
+++ b/lasso/xml/samlp_request.h
@@ -33,11 +33,16 @@ extern "C" {
 #include <lasso/xml/samlp_request_abstract.h>
 
 #define LASSO_TYPE_SAMLP_REQUEST (lasso_samlp_request_get_type())
-#define LASSO_SAMLP_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAMLP_REQUEST, LassoSamlpRequest))
-#define LASSO_SAMLP_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAMLP_REQUEST, LassoSamlpRequestClass))
-#define LASSO_IS_SAMLP_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAMLP_REQUEST))
-#define LASSO_IS_SAMLP_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAMLP_REQUEST))
-#define LASSO_SAMLP_REQUEST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAMLP_REQUEST, LassoSamlpRequestClass)) 
+#define LASSO_SAMLP_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAMLP_REQUEST, LassoSamlpRequest))
+#define LASSO_SAMLP_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAMLP_REQUEST, LassoSamlpRequestClass))
+#define LASSO_IS_SAMLP_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAMLP_REQUEST))
+#define LASSO_IS_SAMLP_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAMLP_REQUEST))
+#define LASSO_SAMLP_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAMLP_REQUEST, LassoSamlpRequestClass)) 
 
 typedef struct _LassoSamlpRequest LassoSamlpRequest;
 typedef struct _LassoSamlpRequestClass LassoSamlpRequestClass;
diff --git a/lasso/xml/samlp_request_abstract.h b/lasso/xml/samlp_request_abstract.h
index 25d82320..4b27e9d0 100644
--- a/lasso/xml/samlp_request_abstract.h
+++ b/lasso/xml/samlp_request_abstract.h
@@ -33,11 +33,19 @@ extern "C" {
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_SAMLP_REQUEST_ABSTRACT (lasso_samlp_request_abstract_get_type())
-#define LASSO_SAMLP_REQUEST_ABSTRACT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAMLP_REQUEST_ABSTRACT, LassoSamlpRequestAbstract))
-#define LASSO_SAMLP_REQUEST_ABSTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAMLP_REQUEST_ABSTRACT, LassoSamlpRequestAbstractClass))
-#define LASSO_IS_SAMLP_REQUEST_ABSTRACT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAMLP_REQUEST_ABSTRACT))
-#define LASSO_IS_SAMLP_REQUEST_ABSTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAMLP_REQUEST_ABSTRACT))
-#define LASSO_SAMLP_REQUEST_ABSTRACT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAMLP_REQUEST_ABSTRACT, LassoSamlpRequestAbstractClass)) 
+#define LASSO_SAMLP_REQUEST_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAMLP_REQUEST_ABSTRACT, \
+				    LassoSamlpRequestAbstract))
+#define LASSO_SAMLP_REQUEST_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAMLP_REQUEST_ABSTRACT, \
+				 LassoSamlpRequestAbstractClass))
+#define LASSO_IS_SAMLP_REQUEST_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAMLP_REQUEST_ABSTRACT))
+#define LASSO_IS_SAMLP_REQUEST_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAMLP_REQUEST_ABSTRACT))
+#define LASSO_SAMLP_REQUEST_ABSTRACT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAMLP_REQUEST_ABSTRACT, \
+				    LassoSamlpRequestAbstractClass)) 
 
 typedef struct _LassoSamlpRequestAbstract LassoSamlpRequestAbstract;
 typedef struct _LassoSamlpRequestAbstractClass LassoSamlpRequestAbstractClass;
diff --git a/lasso/xml/samlp_response.h b/lasso/xml/samlp_response.h
index a1121659..c8f940d3 100644
--- a/lasso/xml/samlp_response.h
+++ b/lasso/xml/samlp_response.h
@@ -35,11 +35,16 @@ extern "C" {
 #include <lasso/xml/saml_assertion.h>
 
 #define LASSO_TYPE_SAMLP_RESPONSE (lasso_samlp_response_get_type())
-#define LASSO_SAMLP_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAMLP_RESPONSE, LassoSamlpResponse))
-#define LASSO_SAMLP_RESPONSE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAMLP_RESPONSE, LassoSamlpResponseClass))
-#define LASSO_IS_SAMLP_RESPONSE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAMLP_RESPONSE))
-#define LASSO_IS_SAMLP_RESPONSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAMLP_RESPONSE))
-#define LASSO_SAMLP_RESPONSE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAMLP_RESPONSE, LassoSamlpResponseClass)) 
+#define LASSO_SAMLP_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAMLP_RESPONSE, LassoSamlpResponse))
+#define LASSO_SAMLP_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAMLP_RESPONSE, LassoSamlpResponseClass))
+#define LASSO_IS_SAMLP_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAMLP_RESPONSE))
+#define LASSO_IS_SAMLP_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAMLP_RESPONSE))
+#define LASSO_SAMLP_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAMLP_RESPONSE, LassoSamlpResponseClass)) 
 
 typedef struct _LassoSamlpResponse LassoSamlpResponse;
 typedef struct _LassoSamlpResponseClass LassoSamlpResponseClass;
diff --git a/lasso/xml/samlp_response_abstract.h b/lasso/xml/samlp_response_abstract.h
index 8966067f..23342f0e 100644
--- a/lasso/xml/samlp_response_abstract.h
+++ b/lasso/xml/samlp_response_abstract.h
@@ -33,11 +33,19 @@ extern "C" {
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT (lasso_samlp_response_abstract_get_type())
-#define LASSO_SAMLP_RESPONSE_ABSTRACT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT, LassoSamlpResponseAbstract))
-#define LASSO_SAMLP_RESPONSE_ABSTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT, LassoSamlpResponseAbstractClass))
-#define LASSO_IS_SAMLP_RESPONSE_ABSTRACT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT))
-#define LASSO_IS_SAMLP_RESPONSE_ABSTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT))
-#define LASSO_SAMLP_RESPONSE_ABSTRACT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT, LassoSamlpResponseAbstractClass)) 
+#define LASSO_SAMLP_RESPONSE_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT, \
+				    LassoSamlpResponseAbstract))
+#define LASSO_SAMLP_RESPONSE_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT, \
+				 LassoSamlpResponseAbstractClass))
+#define LASSO_IS_SAMLP_RESPONSE_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT))
+#define LASSO_IS_SAMLP_RESPONSE_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT))
+#define LASSO_SAMLP_RESPONSE_ABSTRACT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT, \
+				    LassoSamlpResponseAbstractClass)) 
 
 typedef struct _LassoSamlpResponseAbstract LassoSamlpResponseAbstract;
 typedef struct _LassoSamlpResponseAbstractClass LassoSamlpResponseAbstractClass;
diff --git a/lasso/xml/samlp_status.h b/lasso/xml/samlp_status.h
index edda23a2..8b8c1bcd 100644
--- a/lasso/xml/samlp_status.h
+++ b/lasso/xml/samlp_status.h
@@ -34,11 +34,15 @@ extern "C" {
 #include <lasso/xml/samlp_status_code.h>
 
 #define LASSO_TYPE_SAMLP_STATUS (lasso_samlp_status_get_type())
-#define LASSO_SAMLP_STATUS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAMLP_STATUS, LassoSamlpStatus))
-#define LASSO_SAMLP_STATUS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAMLP_STATUS, LassoSamlpStatusClass))
+#define LASSO_SAMLP_STATUS(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAMLP_STATUS, LassoSamlpStatus))
+#define LASSO_SAMLP_STATUS_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAMLP_STATUS, LassoSamlpStatusClass))
 #define LASSO_IS_SAMLP_STATUS(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAMLP_STATUS))
-#define LASSO_IS_SAMLP_STATUS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAMLP_STATUS))
-#define LASSO_SAMLP_STATUS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAMLP_STATUS, LassoSamlpStatusClass)) 
+#define LASSO_IS_SAMLP_STATUS_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAMLP_STATUS))
+#define LASSO_SAMLP_STATUS_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAMLP_STATUS, LassoSamlpStatusClass)) 
 
 typedef struct _LassoSamlpStatus LassoSamlpStatus;
 typedef struct _LassoSamlpStatusClass LassoSamlpStatusClass;
diff --git a/lasso/xml/samlp_status_code.h b/lasso/xml/samlp_status_code.h
index bb78c66b..b3c306ae 100644
--- a/lasso/xml/samlp_status_code.h
+++ b/lasso/xml/samlp_status_code.h
@@ -33,11 +33,16 @@ extern "C" {
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_SAMLP_STATUS_CODE (lasso_samlp_status_code_get_type())
-#define LASSO_SAMLP_STATUS_CODE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAMLP_STATUS_CODE, LassoSamlpStatusCode))
-#define LASSO_SAMLP_STATUS_CODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAMLP_STATUS_CODE, LassoSamlpStatusCodeClass))
-#define LASSO_IS_SAMLP_STATUS_CODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAMLP_STATUS_CODE))
-#define LASSO_IS_SAMLP_STATUS_CODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAMLP_STATUS_CODE))
-#define LASSO_SAMLP_STATUS_CODE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAMLP_STATUS_CODE, LassoSamlpStatusCodeClass)) 
+#define LASSO_SAMLP_STATUS_CODE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_SAMLP_STATUS_CODE, LassoSamlpStatusCode))
+#define LASSO_SAMLP_STATUS_CODE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_SAMLP_STATUS_CODE, LassoSamlpStatusCodeClass))
+#define LASSO_IS_SAMLP_STATUS_CODE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_SAMLP_STATUS_CODE))
+#define LASSO_IS_SAMLP_STATUS_CODE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_SAMLP_STATUS_CODE))
+#define LASSO_SAMLP_STATUS_CODE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_SAMLP_STATUS_CODE, LassoSamlpStatusCodeClass)) 
 
 typedef struct _LassoSamlpStatusCode LassoSamlpStatusCode;
 typedef struct _LassoSamlpStatusCodeClass LassoSamlpStatusCodeClass;
diff --git a/lasso/xml/strings.h b/lasso/xml/strings.h
index de6c7c1b..dcc9f8d6 100644
--- a/lasso/xml/strings.h
+++ b/lasso/xml/strings.h
@@ -59,7 +59,8 @@
 
 /* StatusCodes */
 #define LASSO_LIB_STATUS_CODE_FEDERATION_DOES_NOT_EXIST	       "lib:FederationDoesNotExist"
-#define LASSO_LIB_STATUS_CODE_INVALID_ASSERTION_CONSUMER_SERVICE_INDEX "lib:InvalidAssertionConsumerServiceIndex"
+#define LASSO_LIB_STATUS_CODE_INVALID_ASSERTION_CONSUMER_SERVICE_INDEX \
+	"lib:InvalidAssertionConsumerServiceIndex"
 #define LASSO_LIB_STATUS_CODE_INVALID_SIGNATURE	               "lib:InvalidSignature"
 #define LASSO_LIB_STATUS_CODE_NO_AUTHN_CONTEXT	               "lib:NoAuthnContext"
 #define LASSO_LIB_STATUS_CODE_NO_AVAILABLEIDP	               "lib:NoAvailableIDP"
@@ -71,13 +72,20 @@
 #define LASSO_LIB_STATUS_CODE_UNSUPPORTED_PROFILE	               "lib:UnsupportedProfile"
 
 /* ProtocolProfile */
-#define LASSO_LIB_PROTOCOL_PROFILE_BRWS_ART	         "http://projectliberty.org/profiles/brws-art"
-#define LASSO_LIB_PROTOCOL_PROFILE_BRWS_POST	         "http://projectliberty.org/profiles/brws-post"
-#define LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_IDP_HTTP	 "http://projectliberty.org/profiles/fedterm-idp-http"
-#define LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_IDP_SOAP	 "http://projectliberty.org/profiles/fedterm-idp-soap"
-#define LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_SP_HTTP	 "http://projectliberty.org/profiles/fedterm-sp-http"
-#define LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_SP_SOAP	 "http://projectliberty.org/profiles/fedterm-sp-soap"
-#define LASSO_LIB_PROTOCOL_PROFILE_NIM_SP_HTTP         "http://projectliberty.org/profiles/nim-sp-http"
+#define LASSO_LIB_PROTOCOL_PROFILE_BRWS_ART	\
+	"http://projectliberty.org/profiles/brws-art"
+#define LASSO_LIB_PROTOCOL_PROFILE_BRWS_POST	\
+	"http://projectliberty.org/profiles/brws-post"
+#define LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_IDP_HTTP	\
+	"http://projectliberty.org/profiles/fedterm-idp-http"
+#define LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_IDP_SOAP	\
+	"http://projectliberty.org/profiles/fedterm-idp-soap"
+#define LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_SP_HTTP	\
+	"http://projectliberty.org/profiles/fedterm-sp-http"
+#define LASSO_LIB_PROTOCOL_PROFILE_FED_TERM_SP_SOAP	\
+	"http://projectliberty.org/profiles/fedterm-sp-soap"
+#define LASSO_LIB_PROTOCOL_PROFILE_NIM_SP_HTTP	\
+	"http://projectliberty.org/profiles/nim-sp-http"
 #define LASSO_LIB_PROTOCOL_PROFILE_RNI_IDP_HTTP	 "http://projectliberty.org/profiles/rni-idp-http"
 #define LASSO_LIB_PROTOCOL_PROFILE_RNI_IDP_SOAP	 "http://projectliberty.org/profiles/rni-idp-soap"
 #define LASSO_LIB_PROTOCOL_PROFILE_RNI_SP_HTTP	 "http://projectliberty.org/profiles/rni-sp-http"
@@ -139,20 +147,25 @@
 #define LASSO_SAML_AUTHENTICATION_METHOD_PASSWORD	 "urn:oasis:names:tc:SAML:1.0:am:password"
 #define LASSO_SAML_AUTHENTICATION_METHOD_KERBEROS	 "urn:ietf:rfc:1510"
 #define LASSO_SAML_AUTHENTICATION_METHOD_SECURE_REMOTE_PASSWORD	 "urn:ietf:rfc:2945"
-#define LASSO_SAML_AUTHENTICATION_METHOD_HARDWARE_TOKEN	 "urn:oasis:names:tc:SAML:1.0:am:HardwareToken"
+#define LASSO_SAML_AUTHENTICATION_METHOD_HARDWARE_TOKEN		\
+	"urn:oasis:names:tc:SAML:1.0:am:HardwareToken"
 #define LASSO_SAML_AUTHENTICATION_METHOD_SMARTCARD_PKI	 "urn:ietf:rfc:2246"
 #define LASSO_SAML_AUTHENTICATION_METHOD_SOFTWARE_PKI	 "urn:oasis:names:tc:SAML:1.0:am:X509-PKI"
 #define LASSO_SAML_AUTHENTICATION_METHOD_PGP	 "urn:oasis:names:tc:SAML:1.0:am:PGP"
 #define LASSO_SAML_AUTHENTICATION_METHODS_PKI	 "urn:oasis:names:tc:SAML:1.0:am:SPKI"
 #define LASSO_SAML_AUTHENTICATION_METHOD_XKMS	 "urn:oasis:names:tc:SAML:1.0:am:XKMS"
 #define LASSO_SAML_AUTHENTICATION_METHOD_XMLD_SIG	 "urn:ietf:rfc:3075"
-#define LASSO_SAML_AUTHENTICATION_METHOD_UNSPECIFIED	 "urn:oasis:names:tc:SAML:1.0:am:unspecified"
+#define LASSO_SAML_AUTHENTICATION_METHOD_UNSPECIFIED	\
+	"urn:oasis:names:tc:SAML:1.0:am:unspecified"
 
 /* ConfirmationMethods */
-#define LASSO_SAML_CONFIRMATION_METHOD_ARTIFACT01	 "urn:oasis:names:tc:SAML:1.0:cm:artifact-01"
+#define LASSO_SAML_CONFIRMATION_METHOD_ARTIFACT01	\
+	"urn:oasis:names:tc:SAML:1.0:cm:artifact-01"
 #define LASSO_SAML_CONFIRMATION_METHOD_BEARER	 "urn:oasis:names:tc:SAML:1.0:cm:bearer"
-#define LASSO_SAML_CONFIRMATION_METHOD_HOLDER_OF_KEY	 "urn:oasis:names:tc:SAML:1.0:cm:holder-of-key"
-#define LASSO_SAML_CONFIRMATION_METHOD_SENDER_VOUCHES	 "urn:oasis:names:tc:SAML:1.0:cm:sender-vouches"
+#define LASSO_SAML_CONFIRMATION_METHOD_HOLDER_OF_KEY	 \
+	"urn:oasis:names:tc:SAML:1.0:cm:holder-of-key"
+#define LASSO_SAML_CONFIRMATION_METHOD_SENDER_VOUCHES	 \
+	"urn:oasis:names:tc:SAML:1.0:cm:sender-vouches"
 
 /*****************************************************************************/
 /* SOAP                                                                      */
diff --git a/lasso/xml/tools.h b/lasso/xml/tools.h
index ec7a4e6d..72e6fc5c 100644
--- a/lasso/xml/tools.h
+++ b/lasso/xml/tools.h
@@ -57,7 +57,8 @@ LASSO_EXPORT xmlSecKeysMngr* lasso_load_certs_from_pem_certs_chain_file (const c
 LASSO_EXPORT xmlChar* lasso_query_sign(xmlChar *query,
 		lassoSignatureMethod sign_method, const char *private_key_file);
 
-LASSO_EXPORT int lasso_query_verify_signature(const char *query, const char *sender_public_key_file);
+LASSO_EXPORT int lasso_query_verify_signature(
+		const char *query, const char *sender_public_key_file);
 
 LASSO_EXPORT char* lasso_sha1(const char *str);
 
diff --git a/lasso/xml/xml.h b/lasso/xml/xml.h
index 19fe1b22..f32d6890 100644
--- a/lasso/xml/xml.h
+++ b/lasso/xml/xml.h
@@ -49,7 +49,7 @@ extern "C" {
 #define LASSO_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_NODE, LassoNodeClass))
 #define LASSO_IS_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_NODE))
 #define LASSO_IS_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_NODE))
-#define LASSO_NODE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_NODE, LassoNodeClass)) 
+#define LASSO_NODE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_NODE, LassoNodeClass))
 
 typedef enum {
 	LASSO_MESSAGE_FORMAT_ERROR = -1,