diff --git a/src/input.c b/src/input.c
index 8976c48..2833e2f 100644
--- a/src/input.c
+++ b/src/input.c
@@ -368,7 +368,7 @@ int change_input(const int c) {
 
 	switch(c) {
 		case '*': /* invert page */
-			for(int i = 0; i < nextline-1; i++) {
+			for(int i = 0; i < (nextline-1); i++) {
 				change[topref + i] = !change[topref + i];
 			}
 			window_change |= CH_RESULT;
@@ -401,6 +401,7 @@ int change_input(const int c) {
 		case ctrl('D'):
 			changestring(input_line, newpat, change, totallines);
 			free(change);
+			change = NULL;
 			input_mode = INPUT_NORMAL;
 			horswp_window();
 			rebuild_reference();
@@ -420,8 +421,8 @@ int change_input(const int c) {
 	return 0;
 }
 
-int changestring(const char *from, const char *to, const bool *const change,
-	const int change_len) {
+// XXX: move this
+int changestring(const char *from, const char *to, const bool *const change, const int change_len) {
 	char  newfile[PATHLEN + 1]; /* new file name */
 	char  oldfile[PATHLEN + 1]; /* old file name */
 	char  linenum[NUMLEN + 1];	/* file line number */
diff --git a/src/lookup.c b/src/lookup.c
index ee2ab93..c7bb685 100644
--- a/src/lookup.c
+++ b/src/lookup.c
@@ -102,12 +102,9 @@ static struct keystruct *hashtab[HASHMOD]; /* pointer table */
 /* put the keywords into the symbol table */
 
 void initsymtab(void) {
-	unsigned int	  i, j;
-	struct keystruct *p;
-
-	for(i = 1; i < KEYWORDS; ++i) {
-		p		   = keyword + i;
-		j		   = hash(p->text) % HASHMOD;
+	for(unsigned i = 1; i < KEYWORDS; ++i) {
+		struct keystruct *p	= keyword + i;
+		int j		        = hash(p->text) % HASHMOD;
 		p->next	   = hashtab[j];
 		hashtab[j] = p;
 	}
diff --git a/src/mypopen.c b/src/mypopen.c
index 9034c42..c9c4853 100644
--- a/src/mypopen.c
+++ b/src/mypopen.c
@@ -93,13 +93,14 @@ FILE *myfopen(char *path, char *mode) {
 	if(fp && !strchr(mode, 'b')) { SETMODE(fileno(fp), O_TEXT); }
 #endif /* SETMODE */
 
-	if(fp && (fcntl(fileno(fp), F_SETFD, CLOSE_ON_EXEC) != -1))
+	if(fp && (fcntl(fileno(fp), F_SETFD, CLOSE_ON_EXEC) != -1)) {
 		return (fp);
-
-	else {
-		if(fp) fclose(fp);
-		return (NULL);
 	}
+
+	if(fp) {
+		fclose(fp);
+	}
+	return (NULL);
 }
 
 FILE *mypopen(char *cmd, char *mode) {
@@ -126,16 +127,17 @@ FILE *mypopen(char *cmd, char *mode) {
 		close(yourside);
 		execlp(shell, basename(shell), "-c", cmd, (void *)0);
 		_exit(1);
-	} else if(pid > 0)
+	} else if(pid > 0) {
 		tstat = signal(SIGTSTP, SIG_DFL);
-	if(pid == -1) return (NULL);
+	}
+	if(pid == -1) {
+		return (NULL);
+	}
 	popen_pid[myside] = pid;
 	(void)close(yourside);
 	return (fdopen(myside, mode));
 }
 
-/* HBB 20010705: renamed from 'pclose', which would collide with
- * system-supplied function of same name */
 int mypclose(FILE *ptr) {
 	int			 f;
 	pid_t		 r;
@@ -143,17 +145,17 @@ int mypclose(FILE *ptr) {
 	sighandler_t hstat, istat, qstat;
 
 	f = fileno(ptr);
-	(void)fclose(ptr);
+	UNUSED(fclose(ptr));
 	istat = signal(SIGINT, SIG_IGN);
 	qstat = signal(SIGQUIT, SIG_IGN);
 	hstat = signal(SIGHUP, SIG_IGN);
 	while((r = wait(&status)) != popen_pid[f] && r != -1)
 		; /* nothing */
 	if(r == -1) status = -1;
-	(void)signal(SIGINT, istat);
-	(void)signal(SIGQUIT, qstat);
-	(void)signal(SIGHUP, hstat);
-	(void)signal(SIGTSTP, tstat);
+	UNUSED(signal(SIGINT, istat));
+	UNUSED(signal(SIGQUIT, qstat));
+	UNUSED(signal(SIGHUP, hstat));
+	UNUSED(signal(SIGTSTP, tstat));
 	/* mark this pipe closed */
 	popen_pid[f] = 0;
 	return (status);