diff --git a/parser/parser.cpp b/parser/parser.cpp
index 7d425ee5..2fbcbfbd 100644
--- a/parser/parser.cpp
+++ b/parser/parser.cpp
@@ -334,7 +334,7 @@ Predicate parse(const std::string &query)
     return std::move(out_predicate);
 }
 
-void analyzeGrammar()
+void analyze_grammar()
 {
     analyze<pred>();
 }
diff --git a/parser/parser.hpp b/parser/parser.hpp
index 681847f0..39834dde 100644
--- a/parser/parser.hpp
+++ b/parser/parser.hpp
@@ -78,8 +78,8 @@ struct Predicate
 
 Predicate parse(const std::string &query);
 
-void analyzeGrammar();
-bool testGrammar();
+void analyze_grammar();
+bool test_grammar();
 }
 }
 
diff --git a/parser/query_builder.cpp b/parser/query_builder.cpp
index e3834ee1..af0c3d62 100644
--- a/parser/query_builder.cpp
+++ b/parser/query_builder.cpp
@@ -371,7 +371,7 @@ auto value_of_type_for_query(TableGetter&& tables, Value&& value, Arguments &arg
 {
     const bool isColumn = std::is_same<PropertyExpression, typename std::remove_reference<Value>::type>::value;
     using helper = std::conditional_t<isColumn, ColumnGetter<RetType, TableGetter>, ValueGetter<RetType, TableGetter>>;
-    return helper::convert(std::forward<TableGetter>(tables), std::forward<Value>(value), args);
+    return helper::convert(tables, value, args);
 }
 
 template <typename A, typename B>
diff --git a/parser/test.cpp b/parser/test.cpp
index ce290474..f834c505 100644
--- a/parser/test.cpp
+++ b/parser/test.cpp
@@ -134,7 +134,7 @@ static std::vector<std::string> invalid_queries = {
 namespace realm {
 namespace parser {
 
-bool testGrammar()
+bool test_grammar()
 {
     bool success = true;
     for (auto &query : valid_queries) {