diff --git a/libwccl/parser/Parser.cpp b/libwccl/parser/Parser.cpp
index c314933f5f64cb1cb5b14746dc4a29c4808dc4a2..66ddfab81adcfe013bc2ebdd7631eb71fd3332c4 100644
--- a/libwccl/parser/Parser.cpp
+++ b/libwccl/parser/Parser.cpp
@@ -5,7 +5,7 @@
 /**
  * @desc Parser constructor. Default tagset is NULL
  */
-Parser::Parser(const Corpus2::Tagset& t) : tagset(t)
+Parser::Parser(const Corpus2::Tagset& t) : tagset_(t)
 {
 }
 
@@ -45,7 +45,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::StrSet> > Parser::parseStringOperator(
 	ANTLRLexer lexer(istr);
 	ANTLRParser parser(lexer);
 
-	return parser.parse_string_operator(this->tagset);
+	return parser.parse_string_operator(tagset_);
 }
 
 // ----------------------------------------------------------------------------
@@ -75,7 +75,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::Bool> > Parser::parsePredicate(
 	ANTLRLexer lexer(istr);
 	ANTLRParser parser(lexer);
 
-	return parser.parse_predicates(this->tagset);
+	return parser.parse_predicates(tagset_);
 }
 
 // ----------------------------------------------------------------------------
@@ -105,8 +105,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::TSet> > Parser::parseSymSetOperator(
 {
 	ANTLRLexer lexer(istr);
 	ANTLRParser parser(lexer);
-
-	return parser.parse_sym_set_operator(this->tagset);
+	return parser.parse_sym_set_operator(tagset_);
 }
 
 // ----------------------------------------------------------------------------
@@ -141,7 +140,7 @@ boost::shared_ptr<ANTLRParserResultBase> Parser::parseAnyOperator(
 		ANTLRLexer lexer(istr);
 		ANTLRParser parser(lexer);
 		try {
-			result = parser.parse_sym_set_operator(this->tagset);
+			result = parser.parse_sym_set_operator(tagset_);
 		} catch (antlr::ANTLRException) {
 			// ignore, try another type
 		}
@@ -152,7 +151,7 @@ boost::shared_ptr<ANTLRParserResultBase> Parser::parseAnyOperator(
 		ANTLRLexer lexer(istr);
 		ANTLRParser parser(lexer);
 		try {
-			result = parser.parse_string_operator(this->tagset);
+			result = parser.parse_string_operator(tagset_);
 		} catch (antlr::ANTLRException) {
 			// ignore, try another type
 		}
@@ -163,7 +162,7 @@ boost::shared_ptr<ANTLRParserResultBase> Parser::parseAnyOperator(
 		ANTLRLexer lexer(istr);
 		ANTLRParser parser(lexer);
 		try {
-			result = parser.parse_predicates(this->tagset);
+			result = parser.parse_predicates(tagset_);
 		} catch (antlr::ANTLRException) {
 			throw;
 		}
diff --git a/libwccl/parser/Parser.h b/libwccl/parser/Parser.h
index 872adec79768f740c0e6322cf572cf70026a78f4..58ef0824f37c078a120da705cd35b2cf956f869a 100644
--- a/libwccl/parser/Parser.h
+++ b/libwccl/parser/Parser.h
@@ -51,8 +51,13 @@ public:
 			parseAnyOperator(const std::string&) const;
 	boost::shared_ptr<ANTLRParserResultBase>
 			parseAnyOperator(std::istream&) const;
+
+	const Corpus2::Tagset& tagset() const {
+		return tagset_;
+	}
+
 private:
-	const Corpus2::Tagset &tagset;
+	const Corpus2::Tagset &tagset_;
 };
 
 #endif // LIBWCCL_PARSER_PARSER_H