diff --git a/parser/parser.h b/parser/parser.h
index e71a29c25..f5a0d5d58 100644
--- a/parser/parser.h
+++ b/parser/parser.h
@@ -128,7 +128,7 @@ struct cod_entry {
 
 	bool alias_ignore;		/* ignore for alias processing */
 
-	int subset;
+	bool subset;
 
 	pattern_t pattern_type;
 	struct cod_pattern pat;
diff --git a/parser/parser_merge.c b/parser/parser_merge.c
index b93103aa1..6c5603e36 100644
--- a/parser/parser_merge.c
+++ b/parser/parser_merge.c
@@ -44,7 +44,7 @@ static int file_comp(const void *c1, const void *c2)
 		return res;
 
 	if ((*e1)->link_name)
-		res = (*e2)->subset - (*e1)->subset;
+		res = ((int) (*e2)->subset) - ((int) (*e1)->subset);
 	if (res)
 		return res;
 
diff --git a/parser/parser_yacc.y b/parser/parser_yacc.y
index b9a55bf6e..98dd9901b 100644
--- a/parser/parser_yacc.y
+++ b/parser/parser_yacc.y
@@ -648,9 +648,9 @@ flagval:	TOK_VALUE
 		$$ = fv;
 	};
 
-opt_subset_flag: { /* nothing */ $$ = 0; }
-	| TOK_SUBSET { $$ = 1; }
-	| TOK_LE { $$ = 1; }
+opt_subset_flag: { /* nothing */ $$ = false; }
+	| TOK_SUBSET { $$ = true; }
+	| TOK_LE { $$ = true; }
 
 opt_audit_flag: { /* nothing */ $$ = AUDIT_UNSPECIFIED; }
 	| TOK_AUDIT { $$ = AUDIT_FORCE; };