diff --git a/src/libpcp/src/avahi.c b/src/libpcp/src/avahi.c
index d7bf27b..e889bde 100644
--- a/src/libpcp/src/avahi.c
+++ b/src/libpcp/src/avahi.c
@@ -739,18 +739,16 @@ __pmAvahiDiscoverServices(const char *service,
     timeout = discoveryTimeout(); /* default */
 
     timeoutBegin = strstr(mechanism ? mechanism : "", ",timeout=");
-    if (timeoutBegin)
-        {
-            timeoutBegin += strlen(",timeout="); /* skip over it */
-            timeout = strtod (timeoutBegin, & timeoutEnd);
-            if ((*timeoutEnd != '\0' && *timeoutEnd != ',') ||
-                (timeout < 0.0)) {
-		__pmNotifyErr(LOG_WARNING,
-			      "ignored bad avahi timeout = '%*s'\n",
-			      (int)(timeoutEnd-timeoutBegin), timeoutBegin);
-                timeout = discoveryTimeout();
-            }
-        }
+    if (timeoutBegin) {
+	timeoutBegin += strlen(",timeout="); /* skip over it */
+	timeout = strtod (timeoutBegin, & timeoutEnd);
+	if ((*timeoutEnd != '\0' && *timeoutEnd != ',') || (timeout < 0.0)) {
+	    __pmNotifyErr(LOG_WARNING,
+			  "ignored bad avahi timeout = '%*s'\n",
+			  (int)(timeoutEnd-timeoutBegin), timeoutBegin);
+	    timeout = discoveryTimeout();
+	}
+    }
 
     /* Set the timeout. */
     avahi_simple_poll_get(simplePoll)->timeout_new(
diff --git a/src/libpcp/src/internal.h b/src/libpcp/src/internal.h
index ef1ba33..69c45d4 100644
--- a/src/libpcp/src/internal.h
+++ b/src/libpcp/src/internal.h
@@ -261,8 +261,8 @@ typedef struct {
 } __pmServiceInfo;
 
 typedef struct {
-    int	resolve;	/* resolve addresses */
-    int *interrupted;	/* process interrupted */
+    int			resolve;	/* resolve addresses */
+    int			*interrupted;	/* process interrupted */
 } __pmDiscoveryGlobalContext;
 
 extern int __pmAddDiscoveredService(__pmServiceInfo *,