KNF: case (FOO): -> case FOO:, remove /* LINTED */ and /* ARGSUSED */,

remove trailing whitespace and blanks before tabs, improve some indenting;
no functional change

1 files changed, 208 insertions, 325 deletions

diff --git a/mdoc_term.c b/mdoc_term.c
index d209c009..4fbed5de 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.263 2014/04/08 07:13:12 schwarze Exp $ */
+/*	$Id: mdoc_term.c,v 1.264 2014/04/20 16:46:05 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -42,7 +42,7 @@ struct	termpair {
 
 #define	DECL_ARGS struct termp *p, \
 		  struct termpair *pair, \
-	  	  const struct mdoc_meta *meta, \
+		  const struct mdoc_meta *meta, \
 		  struct mdoc_node *n
 
 struct	termact {
@@ -57,11 +57,11 @@ static	size_t	  a2offs(const struct termp *, const char *);
 static	void	  print_bvspace(struct termp *,
 			const struct mdoc_node *,
 			const struct mdoc_node *);
-static	void  	  print_mdoc_node(DECL_ARGS);
+static	void	  print_mdoc_node(DECL_ARGS);
 static	void	  print_mdoc_nodelist(DECL_ARGS);
 static	void	  print_mdoc_head(struct termp *, const void *);
 static	void	  print_mdoc_foot(struct termp *, const void *);
-static	void	  synopsis_pre(struct termp *, 
+static	void	  synopsis_pre(struct termp *,
 			const struct mdoc_node *);
 
 static	void	  termp____post(DECL_ARGS);
@@ -128,8 +128,8 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ NULL, NULL }, /* Dt */
 	{ NULL, NULL }, /* Os */
 	{ termp_sh_pre, termp_sh_post }, /* Sh */
-	{ termp_ss_pre, termp_ss_post }, /* Ss */ 
-	{ termp_sp_pre, NULL }, /* Pp */ 
+	{ termp_ss_pre, termp_ss_post }, /* Ss */
+	{ termp_sp_pre, NULL }, /* Pp */
 	{ termp_d1_pre, termp_bl_post }, /* D1 */
 	{ termp_d1_pre, termp_bl_post }, /* Dl */
 	{ termp_bd_pre, termp_bd_post }, /* Bd */
@@ -137,30 +137,30 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ termp_bl_pre, termp_bl_post }, /* Bl */
 	{ NULL, NULL }, /* El */
 	{ termp_it_pre, termp_it_post }, /* It */
-	{ termp_under_pre, NULL }, /* Ad */ 
+	{ termp_under_pre, NULL }, /* Ad */
 	{ termp_an_pre, termp_an_post }, /* An */
 	{ termp_under_pre, NULL }, /* Ar */
 	{ termp_cd_pre, NULL }, /* Cd */
 	{ termp_bold_pre, NULL }, /* Cm */
-	{ NULL, NULL }, /* Dv */ 
-	{ NULL, NULL }, /* Er */ 
-	{ NULL, NULL }, /* Ev */ 
+	{ NULL, NULL }, /* Dv */
+	{ NULL, NULL }, /* Er */
+	{ NULL, NULL }, /* Ev */
 	{ termp_ex_pre, NULL }, /* Ex */
-	{ termp_fa_pre, NULL }, /* Fa */ 
-	{ termp_fd_pre, termp_fd_post }, /* Fd */ 
+	{ termp_fa_pre, NULL }, /* Fa */
+	{ termp_fd_pre, termp_fd_post }, /* Fd */
 	{ termp_fl_pre, NULL }, /* Fl */
-	{ termp_fn_pre, NULL }, /* Fn */ 
-	{ termp_ft_pre, NULL }, /* Ft */ 
-	{ termp_bold_pre, NULL }, /* Ic */ 
-	{ termp_in_pre, termp_in_post }, /* In */ 
+	{ termp_fn_pre, NULL }, /* Fn */
+	{ termp_ft_pre, NULL }, /* Ft */
+	{ termp_bold_pre, NULL }, /* Ic */
+	{ termp_in_pre, termp_in_post }, /* In */
 	{ termp_li_pre, NULL }, /* Li */
-	{ termp_nd_pre, NULL }, /* Nd */ 
-	{ termp_nm_pre, termp_nm_post }, /* Nm */ 
+	{ termp_nd_pre, NULL }, /* Nd */
+	{ termp_nm_pre, termp_nm_post }, /* Nm */
 	{ termp_quote_pre, termp_quote_post }, /* Op */
 	{ NULL, NULL }, /* Ot */
 	{ termp_under_pre, NULL }, /* Pa */
 	{ termp_rv_pre, NULL }, /* Rv */
-	{ NULL, NULL }, /* St */ 
+	{ NULL, NULL }, /* St */
 	{ termp_under_pre, NULL }, /* Va */
 	{ termp_vt_pre, NULL }, /* Vt */
 	{ termp_xr_pre, NULL }, /* Xr */
@@ -180,7 +180,7 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ termp_quote_pre, termp_quote_post }, /* Aq */
 	{ NULL, NULL }, /* At */
 	{ NULL, NULL }, /* Bc */
-	{ termp_bf_pre, NULL }, /* Bf */ 
+	{ termp_bf_pre, NULL }, /* Bf */
 	{ termp_quote_pre, termp_quote_post }, /* Bo */
 	{ termp_quote_pre, termp_quote_post }, /* Bq */
 	{ termp_xx_pre, NULL }, /* Bsx */
@@ -191,7 +191,7 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ termp_quote_pre, termp_quote_post }, /* Dq */
 	{ NULL, NULL }, /* Ec */ /* FIXME: no space */
 	{ NULL, NULL }, /* Ef */
-	{ termp_under_pre, NULL }, /* Em */ 
+	{ termp_under_pre, NULL }, /* Em */
 	{ termp_quote_pre, termp_quote_post }, /* Eo */
 	{ termp_xx_pre, NULL }, /* Fx */
 	{ termp_bold_pre, NULL }, /* Ms */
@@ -219,8 +219,8 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ termp_xx_pre, NULL }, /* Ux */
 	{ NULL, NULL }, /* Xc */
 	{ NULL, NULL }, /* Xo */
-	{ termp_fo_pre, termp_fo_post }, /* Fo */ 
-	{ NULL, NULL }, /* Fc */ 
+	{ termp_fo_pre, termp_fo_post }, /* Fo */
+	{ NULL, NULL }, /* Fc */
 	{ termp_quote_pre, termp_quote_post }, /* Oo */
 	{ NULL, NULL }, /* Oc */
 	{ termp_bk_pre, termp_bk_post }, /* Bk */
@@ -230,21 +230,21 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ NULL, NULL }, /* Fr */
 	{ termp_ud_pre, NULL }, /* Ud */
 	{ NULL, termp_lb_post }, /* Lb */
-	{ termp_sp_pre, NULL }, /* Lp */ 
-	{ termp_lk_pre, NULL }, /* Lk */ 
-	{ termp_under_pre, NULL }, /* Mt */ 
-	{ termp_quote_pre, termp_quote_post }, /* Brq */ 
-	{ termp_quote_pre, termp_quote_post }, /* Bro */ 
-	{ NULL, NULL }, /* Brc */ 
-	{ NULL, termp____post }, /* %C */ 
+	{ termp_sp_pre, NULL }, /* Lp */
+	{ termp_lk_pre, NULL }, /* Lk */
+	{ termp_under_pre, NULL }, /* Mt */
+	{ termp_quote_pre, termp_quote_post }, /* Brq */
+	{ termp_quote_pre, termp_quote_post }, /* Bro */
+	{ NULL, NULL }, /* Brc */
+	{ NULL, termp____post }, /* %C */
 	{ NULL, NULL }, /* Es */ /* TODO */
 	{ NULL, NULL }, /* En */ /* TODO */
-	{ termp_xx_pre, NULL }, /* Dx */ 
-	{ NULL, termp____post }, /* %Q */ 
+	{ termp_xx_pre, NULL }, /* Dx */
+	{ NULL, termp____post }, /* %Q */
 	{ termp_sp_pre, NULL }, /* br */
-	{ termp_sp_pre, NULL }, /* sp */ 
-	{ NULL, termp____post }, /* %U */ 
-	{ NULL, NULL }, /* Ta */ 
+	{ termp_sp_pre, NULL }, /* sp */
+	{ NULL, termp____post }, /* %U */
+	{ NULL, NULL }, /* Ta */
 	{ termp_ll_pre, NULL }, /* ll */
 };
 
@@ -279,7 +279,6 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
 	term_end(p);
 }
 
-
 static void
 print_mdoc_nodelist(DECL_ARGS)
 {
@@ -289,8 +288,6 @@ print_mdoc_nodelist(DECL_ARGS)
 		print_mdoc_nodelist(p, pair, meta, n->next);
 }
 
-
-/* ARGSUSED */
 static void
 print_mdoc_node(DECL_ARGS)
 {
@@ -325,7 +322,7 @@ print_mdoc_node(DECL_ARGS)
 	 */
 
 	switch (n->type) {
-	case (MDOC_TEXT):
+	case MDOC_TEXT:
 		if (' ' == *n->string && MDOC_LINE & n->flags)
 			term_newln(p);
 		if (MDOC_DELIMC & n->flags)
@@ -334,10 +331,10 @@ print_mdoc_node(DECL_ARGS)
 		if (MDOC_DELIMO & n->flags)
 			p->flags |= TERMP_NOSPACE;
 		break;
-	case (MDOC_EQN):
+	case MDOC_EQN:
 		term_eqn(p, n->eqn);
 		break;
-	case (MDOC_TBL):
+	case MDOC_TBL:
 		term_tbl(p, n->span);
 		break;
 	default:
@@ -354,11 +351,11 @@ print_mdoc_node(DECL_ARGS)
 	    (ENDBODY_NOT == n->end ? n : n->pending)->prev_font);
 
 	switch (n->type) {
-	case (MDOC_TEXT):
+	case MDOC_TEXT:
 		break;
-	case (MDOC_TBL):
+	case MDOC_TBL:
 		break;
-	case (MDOC_EQN):
+	case MDOC_EQN:
 		break;
 	default:
 		if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags)
@@ -392,7 +389,6 @@ print_mdoc_node(DECL_ARGS)
 	}
 }
 
-
 static void
 print_mdoc_foot(struct termp *p, const void *arg)
 {
@@ -402,7 +398,7 @@ print_mdoc_foot(struct termp *p, const void *arg)
 
 	term_fontrepl(p, TERMFONT_NONE);
 
-	/* 
+	/*
 	 * Output the footer in new-groff style, that is, three columns
 	 * with the middle being the manual date and flanking columns
 	 * being the operating system:
@@ -413,8 +409,8 @@ print_mdoc_foot(struct termp *p, const void *arg)
 	term_vspace(p);
 
 	p->offset = 0;
-	p->rmargin = (p->maxrmargin - 
-			term_strlen(p, meta->date) + term_len(p, 1)) / 2;
+	p->rmargin = (p->maxrmargin -
+	    term_strlen(p, meta->date) + term_len(p, 1)) / 2;
 	p->trailspace = 1;
 	p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
 
@@ -442,7 +438,6 @@ print_mdoc_foot(struct termp *p, const void *arg)
 	p->flags = 0;
 }
 
-
 static void
 print_mdoc_head(struct termp *p, const void *arg)
 {
@@ -515,7 +510,6 @@ print_mdoc_head(struct termp *p, const void *arg)
 	p->rmargin = p->maxrmargin;
 }
 
-
 static size_t
 a2height(const struct termp *p, const char *v)
 {
@@ -529,7 +523,6 @@ a2height(const struct termp *p, const char *v)
 	return(term_vspan(p, &su));
 }
 
-
 static size_t
 a2width(const struct termp *p, const char *v)
 {
@@ -542,7 +535,6 @@ a2width(const struct termp *p, const char *v)
 	return(term_hspan(p, &su));
 }
 
-
 static size_t
 a2offs(const struct termp *p, const char *v)
 {
@@ -562,16 +554,15 @@ a2offs(const struct termp *p, const char *v)
 	return(term_hspan(p, &su));
 }
 
-
 /*
  * Determine how much space to print out before block elements of `It'
  * (and thus `Bl') and `Bd'.  And then go ahead and print that space,
  * too.
  */
 static void
-print_bvspace(struct termp *p, 
-		const struct mdoc_node *bl, 
-		const struct mdoc_node *n)
+print_bvspace(struct termp *p,
+	const struct mdoc_node *bl,
+	const struct mdoc_node *n)
 {
 	const struct mdoc_node	*nn;
 
@@ -617,7 +608,6 @@ print_bvspace(struct termp *p,
 }
 
 
-/* ARGSUSED */
 static int
 termp_ll_pre(DECL_ARGS)
 {
@@ -626,15 +616,13 @@ termp_ll_pre(DECL_ARGS)
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 termp_it_pre(DECL_ARGS)
 {
 	const struct mdoc_node *bl, *nn;
-	char		        buf[7];
-	int		        i;
-	size_t		        width, offset, ncols, dcol;
+	char			buf[7];
+	int			i;
+	size_t			width, offset, ncols, dcol;
 	enum mdoc_list		type;
 
 	if (MDOC_BLOCK == n->type) {
@@ -645,7 +633,7 @@ termp_it_pre(DECL_ARGS)
 	bl = n->parent->parent->parent;
 	type = bl->norm->Bl.type;
 
-	/* 
+	/*
 	 * First calculate width and offset.  This is pretty easy unless
 	 * we're a -column list, in which case all prior columns must
 	 * be accounted for.
@@ -657,7 +645,7 @@ termp_it_pre(DECL_ARGS)
 		offset = a2offs(p, bl->norm->Bl.offs);
 
 	switch (type) {
-	case (LIST_column):
+	case LIST_column:
 		if (MDOC_HEAD == n->type)
 			break;
 
@@ -671,21 +659,19 @@ termp_it_pre(DECL_ARGS)
 		 * - For more than 5 columns, add only one column.
 		 */
 		ncols = bl->norm->Bl.ncols;
-
-		/* LINTED */
-		dcol = ncols < 5 ? term_len(p, 4) : 
-			ncols == 5 ? term_len(p, 3) : term_len(p, 1);
+		dcol = ncols < 5 ? term_len(p, 4) :
+		    ncols == 5 ? term_len(p, 3) : term_len(p, 1);
 
 		/*
 		 * Calculate the offset by applying all prior MDOC_BODY,
 		 * so we stop at the MDOC_HEAD (NULL == nn->prev).
 		 */
 
-		for (i = 0, nn = n->prev; 
-				nn->prev && i < (int)ncols; 
-				nn = nn->prev, i++)
-			offset += dcol + a2width
-				(p, bl->norm->Bl.cols[i]);
+		for (i = 0, nn = n->prev;
+		    nn->prev && i < (int)ncols;
+		    nn = nn->prev, i++)
+			offset += dcol + a2width(p,
+			    bl->norm->Bl.cols[i]);
 
 		/*
 		 * When exceeding the declared number of columns, leave
@@ -706,7 +692,7 @@ termp_it_pre(DECL_ARGS)
 		if (NULL == bl->norm->Bl.width)
 			break;
 
-		/* 
+		/*
 		 * Note: buffer the width by 2, which is groff's magic
 		 * number for buffering single arguments.  See the above
 		 * handling for column for how this changes.
@@ -716,30 +702,30 @@ termp_it_pre(DECL_ARGS)
 		break;
 	}
 
-	/* 
+	/*
 	 * List-type can override the width in the case of fixed-head
 	 * values (bullet, dash/hyphen, enum).  Tags need a non-zero
 	 * offset.
 	 */
 
 	switch (type) {
-	case (LIST_bullet):
+	case LIST_bullet:
 		/* FALLTHROUGH */
-	case (LIST_dash):
+	case LIST_dash:
 		/* FALLTHROUGH */
-	case (LIST_hyphen):
+	case LIST_hyphen:
 		/* FALLTHROUGH */
-	case (LIST_enum):
+	case LIST_enum:
 		if (width < term_len(p, 2))
 			width = term_len(p, 2);
 		break;
-	case (LIST_hang):
+	case LIST_hang:
 		if (0 == width)
 			width = term_len(p, 8);
 		break;
-	case (LIST_column):
+	case LIST_column:
 		/* FALLTHROUGH */
-	case (LIST_tag):
+	case LIST_tag:
 		if (0 == width)
 			width = term_len(p, 10);
 		break;
@@ -747,7 +733,7 @@ termp_it_pre(DECL_ARGS)
 		break;
 	}
 
-	/* 
+	/*
 	 * Whitespace control.  Inset bodies need an initial space,
 	 * while diagonal bodies need two.
 	 */
@@ -755,12 +741,12 @@ termp_it_pre(DECL_ARGS)
 	p->flags |= TERMP_NOSPACE;
 
 	switch (type) {
-	case (LIST_diag):
+	case LIST_diag:
 		if (MDOC_BODY == n->type)
 			term_word(p, "\\ \\ ");
 		break;
-	case (LIST_inset):
-		if (MDOC_BODY == n->type) 
+	case LIST_inset:
+		if (MDOC_BODY == n->type)
 			term_word(p, "\\ ");
 		break;
 	default:
@@ -770,7 +756,7 @@ termp_it_pre(DECL_ARGS)
 	p->flags |= TERMP_NOSPACE;
 
 	switch (type) {
-	case (LIST_diag):
+	case LIST_diag:
 		if (MDOC_HEAD == n->type)
 			term_fontpush(p, TERMFONT_BOLD);
 		break;
@@ -786,7 +772,7 @@ termp_it_pre(DECL_ARGS)
 	 */
 
 	switch (type) {
-	case (LIST_enum):
+	case LIST_enum:
 		/*
 		 * Weird special case.
 		 * Very narrow enum lists actually hang.
@@ -794,17 +780,17 @@ termp_it_pre(DECL_ARGS)
 		if (width == term_len(p, 2))
 			p->flags |= TERMP_HANG;
 		/* FALLTHROUGH */
-	case (LIST_bullet):
+	case LIST_bullet:
 		/* FALLTHROUGH */
-	case (LIST_dash):
+	case LIST_dash:
 		/* FALLTHROUGH */
-	case (LIST_hyphen):
+	case LIST_hyphen:
 		if (MDOC_HEAD != n->type)
 			break;
 		p->flags |= TERMP_NOBREAK;
 		p->trailspace = 1;
 		break;
-	case (LIST_hang):
+	case LIST_hang:
 		if (MDOC_HEAD != n->type)
 			break;
 
@@ -814,15 +800,15 @@ termp_it_pre(DECL_ARGS)
 		 * the "overstep" effect in term_flushln() and treat
 		 * this as a `-ohang' list instead.
 		 */
-		if (n->next->child && 
-				(MDOC_Bl == n->next->child->tok ||
-				 MDOC_Bd == n->next->child->tok))
+		if (n->next->child &&
+		    (MDOC_Bl == n->next->child->tok ||
+		     MDOC_Bd == n->next->child->tok))
 			break;
 
 		p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
 		p->trailspace = 1;
 		break;
-	case (LIST_tag):
+	case LIST_tag:
 		if (MDOC_HEAD != n->type)
 			break;
 
@@ -832,7 +818,7 @@ termp_it_pre(DECL_ARGS)
 		if (NULL == n->next || NULL == n->next->child)
 			p->flags |= TERMP_DANGLE;
 		break;
-	case (LIST_column):
+	case LIST_column:
 		if (MDOC_HEAD == n->type)
 			break;
 
@@ -845,7 +831,7 @@ termp_it_pre(DECL_ARGS)
 		}
 
 		break;
-	case (LIST_diag):
+	case LIST_diag:
 		if (MDOC_HEAD != n->type)
 			break;
 		p->flags |= TERMP_NOBREAK | TERMP_BRIND;
@@ -855,7 +841,7 @@ termp_it_pre(DECL_ARGS)
 		break;
 	}
 
-	/* 
+	/*
 	 * Margin control.  Set-head-width lists have their right
 	 * margins shortened.  The body for these lists has the offset
 	 * necessarily lengthened.  Everybody gets the offset.
@@ -864,26 +850,26 @@ termp_it_pre(DECL_ARGS)
 	p->offset += offset;
 
 	switch (type) {
-	case (LIST_hang):
+	case LIST_hang:
 		/*
 		 * Same stipulation as above, regarding `-hang'.  We
 		 * don't want to recalculate rmargin and offsets when
 		 * using `Bd' or `Bl' within `-hang' overstep lists.
 		 */
 		if (MDOC_HEAD == n->type && n->next->child &&
-				(MDOC_Bl == n->next->child->tok || 
-				 MDOC_Bd == n->next->child->tok))
+		    (MDOC_Bl == n->next->child->tok ||
+		     MDOC_Bd == n->next->child->tok))
 			break;
 		/* FALLTHROUGH */
-	case (LIST_bullet):
+	case LIST_bullet:
 		/* FALLTHROUGH */
-	case (LIST_dash):
+	case LIST_dash:
 		/* FALLTHROUGH */
-	case (LIST_enum):
+	case LIST_enum:
 		/* FALLTHROUGH */
-	case (LIST_hyphen):
+	case LIST_hyphen:
 		/* FALLTHROUGH */
-	case (LIST_tag):
+	case LIST_tag:
 		assert(width);
 		if (MDOC_HEAD == n->type)
 			p->rmargin = p->offset + width;
@@ -893,10 +879,10 @@ termp_it_pre(DECL_ARGS)
 				p->rmargin = p->offset;
 		}
 		break;
-	case (LIST_column):
+	case LIST_column:
 		assert(width);
 		p->rmargin = p->offset + width;
-		/* 
+		/*
 		 * XXX - this behaviour is not documented: the
 		 * right-most column is filled to the right margin.
 		 */
@@ -909,53 +895,53 @@ termp_it_pre(DECL_ARGS)
 		break;
 	}
 
-	/* 
+	/*
 	 * The dash, hyphen, bullet and enum lists all have a special
-	 * HEAD character (temporarily bold, in some cases).  
+	 * HEAD character (temporarily bold, in some cases).
 	 */
 
 	if (MDOC_HEAD == n->type)
 		switch (type) {
-		case (LIST_bullet):
+		case LIST_bullet:
 			term_fontpush(p, TERMFONT_BOLD);
 			term_word(p, "\\[bu]");
 			term_fontpop(p);
 			break;
-		case (LIST_dash):
+		case LIST_dash:
 			/* FALLTHROUGH */
-		case (LIST_hyphen):
+		case LIST_hyphen:
 			term_fontpush(p, TERMFONT_BOLD);
 			term_word(p, "\\(hy");
 			term_fontpop(p);
 			break;
-		case (LIST_enum):
+		case LIST_enum:
 			(pair->ppair->ppair->count)++;
-			snprintf(buf, sizeof(buf), "%d.", 
-					pair->ppair->ppair->count);
+			snprintf(buf, sizeof(buf), "%d.",
+			    pair->ppair->ppair->count);
 			term_word(p, buf);
 			break;
 		default:
 			break;
 		}
 
-	/* 
+	/*
 	 * If we're not going to process our children, indicate so here.
 	 */
 
 	switch (type) {
-	case (LIST_bullet):
+	case LIST_bullet:
 		/* FALLTHROUGH */
-	case (LIST_item):
+	case LIST_item:
 		/* FALLTHROUGH */
-	case (LIST_dash):
+	case LIST_dash:
 		/* FALLTHROUGH */
-	case (LIST_hyphen):
+	case LIST_hyphen:
 		/* FALLTHROUGH */
-	case (LIST_enum):
+	case LIST_enum:
 		if (MDOC_HEAD == n->type)
 			return(0);
 		break;
-	case (LIST_column):
+	case LIST_column:
 		if (MDOC_HEAD == n->type)
 			return(0);
 		break;
@@ -966,8 +952,6 @@ termp_it_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static void
 termp_it_post(DECL_ARGS)
 {
@@ -979,15 +963,15 @@ termp_it_post(DECL_ARGS)
 	type = n->parent->parent->parent->norm->Bl.type;
 
 	switch (type) {
-	case (LIST_item):
+	case LIST_item:
 		/* FALLTHROUGH */
-	case (LIST_diag):
+	case LIST_diag:
 		/* FALLTHROUGH */
-	case (LIST_inset):
+	case LIST_inset:
 		if (MDOC_BODY == n->type)
 			term_newln(p);
 		break;
-	case (LIST_column):
+	case LIST_column:
 		if (MDOC_BODY == n->type)
 			term_flushln(p);
 		break;
@@ -996,7 +980,7 @@ termp_it_post(DECL_ARGS)
 		break;
 	}
 
-	/* 
+	/*
 	 * Now that our output is flushed, we can reset our tags.  Since
 	 * only `It' sets these flags, we're free to assume that nobody
 	 * has munged them in the meanwhile.
@@ -1007,8 +991,6 @@ termp_it_post(DECL_ARGS)
 	p->trailspace = 0;
 }
 
-
-/* ARGSUSED */
 static int
 termp_nm_pre(DECL_ARGS)
 {
@@ -1061,8 +1043,6 @@ termp_nm_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static void
 termp_nm_post(DECL_ARGS)
 {
@@ -1077,8 +1057,6 @@ termp_nm_post(DECL_ARGS)
 		term_flushln(p);
 }
 
-		
-/* ARGSUSED */
 static int
 termp_fl_pre(DECL_ARGS)
 {
@@ -1094,8 +1072,6 @@ termp_fl_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 termp__a_pre(DECL_ARGS)
 {
@@ -1107,8 +1083,6 @@ termp__a_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 termp_an_pre(DECL_ARGS)
 {
@@ -1124,7 +1098,7 @@ termp_an_pre(DECL_ARGS)
 	 * with other macros/text, are split.  -split, in this case,
 	 * will override the condition of the implied first -nosplit.
 	 */
-	
+
 	if (n->sec == SEC_AUTHORS) {
 		if ( ! (TERMP_ANPREC & p->flags)) {
 			if (TERMP_SPLIT & p->flags)
@@ -1143,8 +1117,6 @@ termp_an_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static void
 termp_an_post(DECL_ARGS)
 {
@@ -1165,8 +1137,6 @@ termp_an_post(DECL_ARGS)
 
 }
 
-
-/* ARGSUSED */
 static int
 termp_ns_pre(DECL_ARGS)
 {
@@ -1176,8 +1146,6 @@ termp_ns_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 termp_rs_pre(DECL_ARGS)
 {
@@ -1189,8 +1157,6 @@ termp_rs_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 termp_rv_pre(DECL_ARGS)
 {
@@ -1222,21 +1188,19 @@ termp_rv_pre(DECL_ARGS)
 	else
 		term_word(p, "function returns");
 
-       	term_word(p, "the value 0 if successful; otherwise the value "
-			"-1 is returned and the global variable");
+	term_word(p, "the value 0 if successful; otherwise the "
+	    "value -1 is returned and the global variable");
 
 	term_fontpush(p, TERMFONT_UNDER);
 	term_word(p, "errno");
 	term_fontpop(p);
 
-       	term_word(p, "is set to indicate the error.");
+	term_word(p, "is set to indicate the error.");
 	p->flags |= TERMP_SENTENCE;
 
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 termp_ex_pre(DECL_ARGS)
 {
@@ -1265,14 +1229,12 @@ termp_ex_pre(DECL_ARGS)
 	else
 		term_word(p, "utility exits");
 
-       	term_word(p, "0 on success, and >0 if an error occurs.");
+	term_word(p, "0 on success, and >0 if an error occurs.");
 
 	p->flags |= TERMP_SENTENCE;
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 termp_nd_pre(DECL_ARGS)
 {
@@ -1288,8 +1250,6 @@ termp_nd_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 termp_bl_pre(DECL_ARGS)
 {
@@ -1297,8 +1257,6 @@ termp_bl_pre(DECL_ARGS)
 	return(MDOC_HEAD != n->type);
 }
 
-
-/* ARGSUSED */
 static void
 termp_bl_post(DECL_ARGS)
 {
@@ -1307,7 +1265,6 @@ termp_bl_post(DECL_ARGS)
 		term_newln(p);
 }
 
-/* ARGSUSED */
 static int
 termp_xr_pre(DECL_ARGS)
 {
@@ -1318,7 +1275,7 @@ termp_xr_pre(DECL_ARGS)
 	assert(MDOC_TEXT == n->type);
 	term_word(p, n->string);
 
-	if (NULL == (n = n->next)) 
+	if (NULL == (n = n->next))
 		return(0);
 
 	p->flags |= TERMP_NOSPACE;
@@ -1342,7 +1299,7 @@ termp_xr_pre(DECL_ARGS)
 static void
 synopsis_pre(struct termp *p, const struct mdoc_node *n)
 {
-	/* 
+	/*
 	 * Obviously, if we're not in a SYNOPSIS or no prior macros
 	 * exist, do nothing.
 	 */
@@ -1354,10 +1311,10 @@ synopsis_pre(struct termp *p, const struct mdoc_node *n)
 	 * newline and return.  UNLESS we're `Fo', `Fn', `Fn', in which
 	 * case we soldier on.
 	 */
-	if (n->prev->tok == n->tok && 
-			MDOC_Ft != n->tok && 
-			MDOC_Fo != n->tok && 
-			MDOC_Fn != n->tok) {
+	if (n->prev->tok == n->tok &&
+	    MDOC_Ft != n->tok &&
+	    MDOC_Fo != n->tok &&
+	    MDOC_Fn != n->tok) {
 		term_newln(p);
 		return;
 	}
@@ -1368,18 +1325,18 @@ synopsis_pre(struct termp *p, const struct mdoc_node *n)
 	 * vertical space, else only newline and move on.
 	 */
 	switch (n->prev->tok) {
-	case (MDOC_Fd):
+	case MDOC_Fd:
 		/* FALLTHROUGH */
-	case (MDOC_Fn):
+	case MDOC_Fn:
 		/* FALLTHROUGH */
-	case (MDOC_Fo):
+	case MDOC_Fo:
 		/* FALLTHROUGH */
-	case (MDOC_In):
+	case MDOC_In:
 		/* FALLTHROUGH */
-	case (MDOC_Vt):
+	case MDOC_Vt:
 		term_vspace(p);
 		break;
-	case (MDOC_Ft):
+	case MDOC_Ft:
 		if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
 			term_vspace(p);
 			break;
@@ -1391,7 +1348,6 @@ synopsis_pre(struct termp *p, const struct mdoc_node *n)
 	}
 }
 
-
 static int
 termp_vt_pre(DECL_ARGS)
 {
@@ -1408,8 +1364,6 @@ termp_vt_pre(DECL_ARGS)
 	return(termp_under_pre(p, pair, meta, n));
 }
 
-
-/* ARGSUSED */
 static int
 termp_bold_pre(DECL_ARGS)
 {
@@ -1418,8 +1372,6 @@ termp_bold_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 termp_fd_pre(DECL_ARGS)
 {
@@ -1428,8 +1380,6 @@ termp_fd_pre(DECL_ARGS)
 	return(termp_bold_pre(p, pair, meta, n));
 }
 
-
-/* ARGSUSED */
 static void
 termp_fd_post(DECL_ARGS)
 {
@@ -1437,8 +1387,6 @@ termp_fd_post(DECL_ARGS)
 	term_newln(p);
 }
 
-
-/* ARGSUSED */
 static int
 termp_sh_pre(DECL_ARGS)
 {
@@ -1446,16 +1394,16 @@ termp_sh_pre(DECL_ARGS)
 	/* No vspace between consecutive `Sh' calls. */
 
 	switch (n->type) {
-	case (MDOC_BLOCK):
+	case MDOC_BLOCK:
 		if (n->prev && MDOC_Sh == n->prev->tok)
 			if (NULL == n->prev->body->child)
 				break;
 		term_vspace(p);
 		break;
-	case (MDOC_HEAD):
+	case MDOC_HEAD:
 		term_fontpush(p, TERMFONT_BOLD);
 		break;
-	case (MDOC_BODY):
+	case MDOC_BODY:
 		p->offset = term_len(p, p->defindent);
 		if (SEC_AUTHORS == n->sec)
 			p->flags &= ~(TERMP_SPLIT|TERMP_NOSPLIT);
@@ -1466,17 +1414,15 @@ termp_sh_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static void
 termp_sh_post(DECL_ARGS)
 {
 
 	switch (n->type) {
-	case (MDOC_HEAD):
+	case MDOC_HEAD:
 		term_newln(p);
 		break;
-	case (MDOC_BODY):
+	case MDOC_BODY:
 		term_newln(p);
 		p->offset = 0;
 		break;
@@ -1485,8 +1431,6 @@ termp_sh_post(DECL_ARGS)
 	}
 }
 
-
-/* ARGSUSED */
 static int
 termp_bt_pre(DECL_ARGS)
 {
@@ -1496,8 +1440,6 @@ termp_bt_pre(DECL_ARGS)
 	return(0);
 }
 
-
-/* ARGSUSED */
 static void
 termp_lb_post(DECL_ARGS)
 {
@@ -1506,8 +1448,6 @@ termp_lb_post(DECL_ARGS)
 		term_newln(p);
 }
 
-
-/* ARGSUSED */
 static int
 termp_ud_pre(DECL_ARGS)
 {
@@ -1517,8 +1457,6 @@ termp_ud_pre(DECL_ARGS)
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 termp_d1_pre(DECL_ARGS)
 {
@@ -1530,8 +1468,6 @@ termp_d1_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 termp_ft_pre(DECL_ARGS)
 {
@@ -1542,8 +1478,6 @@ termp_ft_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 termp_fn_pre(DECL_ARGS)
 {
@@ -1605,8 +1539,6 @@ termp_fn_pre(DECL_ARGS)
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 termp_fa_pre(DECL_ARGS)
 {
@@ -1632,8 +1564,6 @@ termp_fa_pre(DECL_ARGS)
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 termp_bd_pre(DECL_ARGS)
 {
@@ -1656,9 +1586,9 @@ termp_bd_pre(DECL_ARGS)
 	 * for macro lines, a newline is appended to the line.  Blank
 	 * lines are allowed.
 	 */
-	
-	if (DISP_literal != n->norm->Bd.type && 
-			DISP_unfilled != n->norm->Bd.type)
+
+	if (DISP_literal != n->norm->Bd.type &&
+	    DISP_unfilled != n->norm->Bd.type)
 		return(1);
 
 	tabwidth = p->tabwidth;
@@ -1678,21 +1608,21 @@ termp_bd_pre(DECL_ARGS)
 		 * anyway, so don't sweat it.
 		 */
 		switch (nn->tok) {
-		case (MDOC_Sm):
+		case MDOC_Sm:
 			/* FALLTHROUGH */
-		case (MDOC_br):
+		case MDOC_br:
 			/* FALLTHROUGH */
-		case (MDOC_sp):
+		case MDOC_sp:
 			/* FALLTHROUGH */
-		case (MDOC_Bl):
+		case MDOC_Bl:
 			/* FALLTHROUGH */
-		case (MDOC_D1):
+		case MDOC_D1:
 			/* FALLTHROUGH */
-		case (MDOC_Dl):
+		case MDOC_Dl:
 			/* FALLTHROUGH */
-		case (MDOC_Lp):
+		case MDOC_Lp:
 			/* FALLTHROUGH */
-		case (MDOC_Pp):
+		case MDOC_Pp:
 			continue;
 		default:
 			break;
@@ -1709,21 +1639,19 @@ termp_bd_pre(DECL_ARGS)
 	return(0);
 }
 
-
-/* ARGSUSED */
 static void
 termp_bd_post(DECL_ARGS)
 {
 	size_t		 rm, rmax;
 
-	if (MDOC_BODY != n->type) 
+	if (MDOC_BODY != n->type)
 		return;
 
 	rm = p->rmargin;
 	rmax = p->maxrmargin;
 
-	if (DISP_literal == n->norm->Bd.type || 
-			DISP_unfilled == n->norm->Bd.type)
+	if (DISP_literal == n->norm->Bd.type ||
+	    DISP_unfilled == n->norm->Bd.type)
 		p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
 	p->flags |= TERMP_NOSPACE;
@@ -1733,8 +1661,6 @@ termp_bd_post(DECL_ARGS)
 	p->maxrmargin = rmax;
 }
 
-
-/* ARGSUSED */
 static int
 termp_bx_pre(DECL_ARGS)
 {
@@ -1758,8 +1684,6 @@ termp_bx_pre(DECL_ARGS)
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 termp_xx_pre(DECL_ARGS)
 {
@@ -1768,22 +1692,22 @@ termp_xx_pre(DECL_ARGS)
 
 	pp = NULL;
 	switch (n->tok) {
-	case (MDOC_Bsx):
+	case MDOC_Bsx:
 		pp = "BSD/OS";
 		break;
-	case (MDOC_Dx):
+	case MDOC_Dx:
 		pp = "DragonFly";
 		break;
-	case (MDOC_Fx):
+	case MDOC_Fx:
 		pp = "FreeBSD";
 		break;
-	case (MDOC_Nx):
+	case MDOC_Nx:
 		pp = "NetBSD";
 		break;
-	case (MDOC_Ox):
+	case MDOC_Ox:
 		pp = "OpenBSD";
 		break;
-	case (MDOC_Ux):
+	case MDOC_Ux:
 		pp = "UNIX";
 		break;
 	default:
@@ -1801,8 +1725,6 @@ termp_xx_pre(DECL_ARGS)
 	return(0);
 }
 
-
-/* ARGSUSED */
 static void
 termp_pf_post(DECL_ARGS)
 {
@@ -1810,19 +1732,17 @@ termp_pf_post(DECL_ARGS)
 	p->flags |= TERMP_NOSPACE;
 }
 
-
-/* ARGSUSED */
 static int
 termp_ss_pre(DECL_ARGS)
 {
 
 	switch (n->type) {
-	case (MDOC_BLOCK):
+	case MDOC_BLOCK:
 		term_newln(p);
 		if (n->prev)
 			term_vspace(p);
 		break;
-	case (MDOC_HEAD):
+	case MDOC_HEAD:
 		term_fontpush(p, TERMFONT_BOLD);
 		p->offset = term_len(p, (p->defindent+1)/2);
 		break;
@@ -1833,8 +1753,6 @@ termp_ss_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static void
 termp_ss_post(DECL_ARGS)
 {
@@ -1843,8 +1761,6 @@ termp_ss_post(DECL_ARGS)
 		term_newln(p);
 }
 
-
-/* ARGSUSED */
 static int
 termp_cd_pre(DECL_ARGS)
 {
@@ -1854,8 +1770,6 @@ termp_cd_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 termp_in_pre(DECL_ARGS)
 {
@@ -1875,8 +1789,6 @@ termp_in_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static void
 termp_in_post(DECL_ARGS)
 {
@@ -1891,18 +1803,16 @@ termp_in_post(DECL_ARGS)
 		term_fontpop(p);
 }
 
-
-/* ARGSUSED */
 static int
 termp_sp_pre(DECL_ARGS)
 {
 	size_t		 i, len;
 
 	switch (n->tok) {
-	case (MDOC_sp):
+	case MDOC_sp:
 		len = n->child ? a2height(p, n->child->string) : 1;
 		break;
-	case (MDOC_br):
+	case MDOC_br:
 		len = 0;
 		break;
 	default:
@@ -1918,8 +1828,6 @@ termp_sp_pre(DECL_ARGS)
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 termp_quote_pre(DECL_ARGS)
 {
@@ -1928,49 +1836,49 @@ termp_quote_pre(DECL_ARGS)
 		return(1);
 
 	switch (n->tok) {
-	case (MDOC_Ao):
+	case MDOC_Ao:
 		/* FALLTHROUGH */
-	case (MDOC_Aq):
+	case MDOC_Aq:
 		term_word(p, "<");
 		break;
-	case (MDOC_Bro):
+	case MDOC_Bro:
 		/* FALLTHROUGH */
-	case (MDOC_Brq):
+	case MDOC_Brq:
 		term_word(p, "{");
 		break;
-	case (MDOC_Oo):
+	case MDOC_Oo:
 		/* FALLTHROUGH */
-	case (MDOC_Op):
+	case MDOC_Op:
 		/* FALLTHROUGH */
-	case (MDOC_Bo):
+	case MDOC_Bo:
 		/* FALLTHROUGH */
-	case (MDOC_Bq):
+	case MDOC_Bq:
 		term_word(p, "[");
 		break;
-	case (MDOC_Do):
+	case MDOC_Do:
 		/* FALLTHROUGH */
-	case (MDOC_Dq):
+	case MDOC_Dq:
 		term_word(p, "\\(lq");
 		break;
-	case (MDOC_Eo):
+	case MDOC_Eo:
 		break;
-	case (MDOC_Po):
+	case MDOC_Po:
 		/* FALLTHROUGH */
-	case (MDOC_Pq):
+	case MDOC_Pq:
 		term_word(p, "(");
 		break;
-	case (MDOC__T):
+	case MDOC__T:
 		/* FALLTHROUGH */
-	case (MDOC_Qo):
+	case MDOC_Qo:
 		/* FALLTHROUGH */
-	case (MDOC_Qq):
+	case MDOC_Qq:
 		term_word(p, "\"");
 		break;
-	case (MDOC_Ql):
+	case MDOC_Ql:
 		/* FALLTHROUGH */
-	case (MDOC_So):
+	case MDOC_So:
 		/* FALLTHROUGH */
-	case (MDOC_Sq):
+	case MDOC_Sq:
 		term_word(p, "\\(oq");
 		break;
 	default:
@@ -1982,8 +1890,6 @@ termp_quote_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static void
 termp_quote_post(DECL_ARGS)
 {
@@ -1994,49 +1900,49 @@ termp_quote_post(DECL_ARGS)
 	p->flags |= TERMP_NOSPACE;
 
 	switch (n->tok) {
-	case (MDOC_Ao):
+	case MDOC_Ao:
 		/* FALLTHROUGH */
-	case (MDOC_Aq):
+	case MDOC_Aq:
 		term_word(p, ">");
 		break;
-	case (MDOC_Bro):
+	case MDOC_Bro:
 		/* FALLTHROUGH */
-	case (MDOC_Brq):
+	case MDOC_Brq:
 		term_word(p, "}");
 		break;
-	case (MDOC_Oo):
+	case MDOC_Oo:
 		/* FALLTHROUGH */
-	case (MDOC_Op):
+	case MDOC_Op:
 		/* FALLTHROUGH */
-	case (MDOC_Bo):
+	case MDOC_Bo:
 		/* FALLTHROUGH */
-	case (MDOC_Bq):
+	case MDOC_Bq:
 		term_word(p, "]");
 		break;
-	case (MDOC_Do):
+	case MDOC_Do:
 		/* FALLTHROUGH */
-	case (MDOC_Dq):
+	case MDOC_Dq:
 		term_word(p, "\\(rq");
 		break;
-	case (MDOC_Eo):
+	case MDOC_Eo:
 		break;
-	case (MDOC_Po):
+	case MDOC_Po:
 		/* FALLTHROUGH */
-	case (MDOC_Pq):
+	case MDOC_Pq:
 		term_word(p, ")");
 		break;
-	case (MDOC__T):
+	case MDOC__T:
 		/* FALLTHROUGH */
-	case (MDOC_Qo):
+	case MDOC_Qo:
 		/* FALLTHROUGH */
-	case (MDOC_Qq):
+	case MDOC_Qq:
 		term_word(p, "\"");
 		break;
-	case (MDOC_Ql):
+	case MDOC_Ql:
 		/* FALLTHROUGH */
-	case (MDOC_So):
+	case MDOC_So:
 		/* FALLTHROUGH */
-	case (MDOC_Sq):
+	case MDOC_Sq:
 		term_word(p, "\\(cq");
 		break;
 	default:
@@ -2045,8 +1951,6 @@ termp_quote_post(DECL_ARGS)
 	}
 }
 
-
-/* ARGSUSED */
 static int
 termp_fo_pre(DECL_ARGS)
 {
@@ -2089,13 +1993,11 @@ termp_fo_pre(DECL_ARGS)
 	return(0);
 }
 
-
-/* ARGSUSED */
 static void
 termp_fo_post(DECL_ARGS)
 {
 
-	if (MDOC_BODY != n->type) 
+	if (MDOC_BODY != n->type)
 		return;
 
 	p->flags |= TERMP_NOSPACE;
@@ -2108,8 +2010,6 @@ termp_fo_post(DECL_ARGS)
 	}
 }
 
-
-/* ARGSUSED */
 static int
 termp_bf_pre(DECL_ARGS)
 {
@@ -2119,18 +2019,16 @@ termp_bf_pre(DECL_ARGS)
 	else if (MDOC_BODY != n->type)
 		return(1);
 
-	if (FONT_Em == n->norm->Bf.font) 
+	if (FONT_Em == n->norm->Bf.font)
 		term_fontpush(p, TERMFONT_UNDER);
-	else if (FONT_Sy == n->norm->Bf.font) 
+	else if (FONT_Sy == n->norm->Bf.font)
 		term_fontpush(p, TERMFONT_BOLD);
-	else 
+	else
 		term_fontpush(p, TERMFONT_NONE);
 
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 termp_sm_pre(DECL_ARGS)
 {
@@ -2146,8 +2044,6 @@ termp_sm_pre(DECL_ARGS)
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 termp_ap_pre(DECL_ARGS)
 {
@@ -2158,8 +2054,6 @@ termp_ap_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static void
 termp____post(DECL_ARGS)
 {
@@ -2187,8 +2081,6 @@ termp____post(DECL_ARGS)
 		term_word(p, ",");
 }
 
-
-/* ARGSUSED */
 static int
 termp_li_pre(DECL_ARGS)
 {
@@ -2197,8 +2089,6 @@ termp_li_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static int
 termp_lk_pre(DECL_ARGS)
 {
@@ -2225,18 +2115,16 @@ termp_lk_pre(DECL_ARGS)
 	return(0);
 }
 
-
-/* ARGSUSED */
 static int
 termp_bk_pre(DECL_ARGS)
 {
 
 	switch (n->type) {
-	case (MDOC_BLOCK):
+	case MDOC_BLOCK:
 		break;
-	case (MDOC_HEAD):
+	case MDOC_HEAD:
 		return(0);
-	case (MDOC_BODY):
+	case MDOC_BODY:
 		if (n->parent->args || 0 == n->prev->nchild)
 			p->flags |= TERMP_PREKEEP;
 		break;
@@ -2248,8 +2136,6 @@ termp_bk_pre(DECL_ARGS)
 	return(1);
 }
 
-
-/* ARGSUSED */
 static void
 termp_bk_post(DECL_ARGS)
 {
@@ -2258,7 +2144,6 @@ termp_bk_post(DECL_ARGS)
 		p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
 }
 
-/* ARGSUSED */
 static void
 termp__t_post(DECL_ARGS)
 {
@@ -2268,13 +2153,12 @@ termp__t_post(DECL_ARGS)
 	 * us instead of underlining us (for disambiguation).
 	 */
 	if (n->parent && MDOC_Rs == n->parent->tok &&
-			n->parent->norm->Rs.quote_T)
+	    n->parent->norm->Rs.quote_T)
 		termp_quote_post(p, pair, meta, n);
 
 	termp____post(p, pair, meta, n);
 }
 
-/* ARGSUSED */
 static int
 termp__t_pre(DECL_ARGS)
 {
@@ -2284,14 +2168,13 @@ termp__t_pre(DECL_ARGS)
 	 * us instead of underlining us (for disambiguation).
 	 */
 	if (n->parent && MDOC_Rs == n->parent->tok &&
-			n->parent->norm->Rs.quote_T)
+	    n->parent->norm->Rs.quote_T)
 		return(termp_quote_pre(p, pair, meta, n));
 
 	term_fontpush(p, TERMFONT_UNDER);
 	return(1);
 }
 
-/* ARGSUSED */
 static int
 termp_under_pre(DECL_ARGS)
 {