diff --git a/ldpd/lde.c b/ldpd/lde.c
index efc07b4547..66398ae41d 100644
--- a/ldpd/lde.c
+++ b/ldpd/lde.c
@@ -760,7 +760,7 @@ lde_update_label(struct fec_node *fn)
 		    fn->fec.u.ipv6.prefixlen) != FILTER_PERMIT)
 			return (NO_LABEL);
 		break;
-	default:
+	case FEC_TYPE_PWID:
 		break;
 	}
 
@@ -790,7 +790,7 @@ lde_update_label(struct fec_node *fn)
 			    fn->fec.u.ipv6.prefixlen) != FILTER_PERMIT)
 				return (MPLS_LABEL_IMPLICIT_NULL);
 			return MPLS_LABEL_IPV6_EXPLICIT_NULL;
-		default:
+		case FEC_TYPE_PWID:
 			break;
 		}
 	}
@@ -929,7 +929,7 @@ lde_fec2prefix(const struct fec *fec, struct prefix *prefix)
 		prefix->u.prefix6 = fec->u.ipv6.prefix;
 		prefix->prefixlen = fec->u.ipv6.prefixlen;
 		break;
-	default:
+	case FEC_TYPE_PWID:
 		prefix->family = AF_UNSPEC;
 		break;
 	}
@@ -1314,7 +1314,7 @@ lde_send_labelrequest(struct lde_nbr *ln, struct fec_node *fn,
 			if (!ln->v6_enabled)
 				return;
 			break;
-		default:
+		case FEC_TYPE_PWID:
 			fatalx("lde_send_labelrequest: unknown af");
 		}
 	} else
@@ -1595,7 +1595,7 @@ lde_nbr_addr_update(struct lde_nbr *ln, struct lde_addr *lde_addr, int removed)
 			if (lde_addr->af != AF_INET6)
 				continue;
 			break;
-		default:
+		case FEC_TYPE_PWID:
 			continue;
 		}
 
diff --git a/ldpd/lde_lib.c b/ldpd/lde_lib.c
index 4366560546..5d173c40c1 100644
--- a/ldpd/lde_lib.c
+++ b/ldpd/lde_lib.c
@@ -178,7 +178,7 @@ rt_dump(pid_t pid)
 			rtctl.prefix.v6 = fn->fec.u.ipv6.prefix;
 			rtctl.prefixlen = fn->fec.u.ipv6.prefixlen;
 			break;
-		default:
+		case FEC_TYPE_PWID:
 			continue;
 		}
 
@@ -505,7 +505,7 @@ lde_check_mapping(struct map *map, struct lde_nbr *ln, int rcvd_label_mapping)
 		    fec.u.ipv6.prefixlen) != FILTER_PERMIT)
 			return;
 		break;
-	default:
+	case FEC_TYPE_PWID:
 		break;
 	}
 
@@ -665,7 +665,7 @@ lde_check_request(struct map *map, struct lde_nbr *ln)
 			lde_send_notification(ln, S_LOOP_DETECTED, map->msg_id,
 			    htons(MSG_TYPE_LABELREQUEST));
 			return;
-		default:
+		case FEC_TYPE_PWID:
 			break;
 		}
 	}
diff --git a/ldpd/ldp_zebra.c b/ldpd/ldp_zebra.c
index 059115915a..833545cf57 100644
--- a/ldpd/ldp_zebra.c
+++ b/ldpd/ldp_zebra.c
@@ -597,7 +597,7 @@ ldp_zebra_read_route(ZAPI_CALLBACK_ARGS)
 			if (!(kr.flags & F_CONNECTED))
 				continue;
 			break;
-		default:
+		case NEXTHOP_TYPE_BLACKHOLE:
 			continue;
 		}
 
diff --git a/ldpd/pfkey.c b/ldpd/pfkey.c
index a719d0cbb7..3bd3cc7299 100644
--- a/ldpd/pfkey.c
+++ b/ldpd/pfkey.c
@@ -421,35 +421,33 @@ pfkey_md5sig_remove(struct nbr *nbr)
 int
 pfkey_establish(struct nbr *nbr, struct nbr_params *nbrp)
 {
-	if (nbrp->auth.method == AUTH_NONE)
-		return (0);
-
 	switch (nbr->auth.method) {
 	case AUTH_MD5SIG:
 		strlcpy(nbr->auth.md5key, nbrp->auth.md5key,
 		    sizeof(nbr->auth.md5key));
-		return (pfkey_md5sig_establish(nbr, nbrp));
-	default:
-		break;
+		return pfkey_md5sig_establish(nbr, nbrp);
+	case AUTH_NONE:
+		return 0;
 	}
 
-	return (0);
+	assert(!"Reached end of function where we are not expecting to");
 }
 
 int
 pfkey_remove(struct nbr *nbr)
 {
-	if (nbr->auth.method == AUTH_NONE || !nbr->auth.established)
-		return (0);
+	if (!nbr->auth.established)
+		return 0;
 
 	switch (nbr->auth.method) {
 	case AUTH_MD5SIG:
-		return (pfkey_md5sig_remove(nbr));
-	default:
+		return pfkey_md5sig_remove(nbr);
+	case AUTH_NONE:
+		return 0;
 		break;
 	}
 
-	return (0);
+	assert(!"Reached end of function where we are not expecting to");
 }
 
 int