diff --git a/src/quickfix.c b/src/quickfix.c
index cc6fe0a..1912702 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -2351,7 +2351,7 @@
 	if (!can_abandon(curbuf, forceit))
 	{
 	    no_write_message();
-	    retval = FALSE;
+	    retval = FAIL;
 	}
 	else
 	    retval = do_ecmd(qf_ptr->qf_fnum, NULL, NULL, NULL, (linenr_T)1,
@@ -2395,7 +2395,7 @@
 	}
 
 	if (*abort)
-	    retval = FALSE;
+	    retval = FAIL;
     }
 
     return retval;
@@ -4172,7 +4172,7 @@
     for (qf_idx = 0; qf_idx < qi->qf_listcount; qf_idx++)
 	if (qi->qf_lists[qf_idx].qf_id == qfid)
 	    return qf_idx;
-    return -1;
+    return INVALID_QFIDX;
 }
 
 /*
@@ -4889,7 +4889,7 @@
 	}
     }
 
-    if (qf_idx == -1)
+    if (qf_idx == INVALID_QFIDX)
 	qf_idx = qi->qf_curlist;
 
     if (qf_idx >= qi->qf_listcount