diff --git a/test/fixtures/test_grammars/external_and_internal_anonymous_tokens/scanner.c b/test/fixtures/test_grammars/external_and_internal_anonymous_tokens/scanner.c
index 187c675e..4d697a90 100644
--- a/test/fixtures/test_grammars/external_and_internal_anonymous_tokens/scanner.c
+++ b/test/fixtures/test_grammars/external_and_internal_anonymous_tokens/scanner.c
@@ -13,10 +13,6 @@ void tree_sitter_external_and_internal_anonymous_tokens_external_scanner_destroy
   void *payload
 ) {}
 
-void tree_sitter_external_and_internal_anonymous_tokens_external_scanner_reset(
-  void *payload
-) {}
-
 unsigned tree_sitter_external_and_internal_anonymous_tokens_external_scanner_serialize(
   void *payload,
   char *buffer
@@ -31,10 +27,10 @@ void tree_sitter_external_and_internal_anonymous_tokens_external_scanner_deseria
 bool tree_sitter_external_and_internal_anonymous_tokens_external_scanner_scan(
   void *payload,
   TSLexer *lexer,
-  const bool *whitelist
+  const bool *valid_symbols
 ) {
   // If a line-break is a valid lookahead token, only skip spaces.
-  if (whitelist[LINE_BREAK]) {
+  if (valid_symbols[LINE_BREAK]) {
     while (lexer->lookahead == ' ' || lexer->lookahead == '\r') {
       lexer->advance(lexer, true);
     }
@@ -48,7 +44,7 @@ bool tree_sitter_external_and_internal_anonymous_tokens_external_scanner_scan(
 
   // If a line-break is not a valid lookahead token, skip line breaks as well
   // as spaces.
-  if (whitelist[STRING]) {
+  if (valid_symbols[STRING]) {
     while (lexer->lookahead == ' ' || lexer->lookahead == '\r' || lexer->lookahead == '\n') {
       lexer->advance(lexer, true);
     }
diff --git a/test/fixtures/test_grammars/external_and_internal_tokens/scanner.c b/test/fixtures/test_grammars/external_and_internal_tokens/scanner.c
index 55454f29..b3e790df 100644
--- a/test/fixtures/test_grammars/external_and_internal_tokens/scanner.c
+++ b/test/fixtures/test_grammars/external_and_internal_tokens/scanner.c
@@ -9,13 +9,7 @@ void *tree_sitter_external_and_internal_tokens_external_scanner_create() {
   return NULL;
 }
 
-void tree_sitter_external_and_internal_tokens_external_scanner_destroy(
-  void *payload
-) {}
-
-void tree_sitter_external_and_internal_tokens_external_scanner_reset(
-  void *payload
-) {}
+void tree_sitter_external_and_internal_tokens_external_scanner_destroy(void *payload) {}
 
 unsigned tree_sitter_external_and_internal_tokens_external_scanner_serialize(
   void *payload,
@@ -31,10 +25,10 @@ void tree_sitter_external_and_internal_tokens_external_scanner_deserialize(
 bool tree_sitter_external_and_internal_tokens_external_scanner_scan(
   void *payload,
   TSLexer *lexer,
-  const bool *whitelist
+  const bool *valid_symbols
 ) {
   // If a line-break is a valid lookahead token, only skip spaces.
-  if (whitelist[LINE_BREAK]) {
+  if (valid_symbols[LINE_BREAK]) {
     while (lexer->lookahead == ' ' || lexer->lookahead == '\r') {
       lexer->advance(lexer, true);
     }
@@ -48,7 +42,7 @@ bool tree_sitter_external_and_internal_tokens_external_scanner_scan(
 
   // If a line-break is not a valid lookahead token, skip line breaks as well
   // as spaces.
-  if (whitelist[STRING]) {
+  if (valid_symbols[STRING]) {
     while (lexer->lookahead == ' ' || lexer->lookahead == '\r' || lexer->lookahead == '\n') {
       lexer->advance(lexer, true);
     }
diff --git a/test/fixtures/test_grammars/external_extra_tokens/scanner.c b/test/fixtures/test_grammars/external_extra_tokens/scanner.c
index 95d58426..fff2665d 100644
--- a/test/fixtures/test_grammars/external_extra_tokens/scanner.c
+++ b/test/fixtures/test_grammars/external_extra_tokens/scanner.c
@@ -8,11 +8,7 @@ void *tree_sitter_external_extra_tokens_external_scanner_create() {
   return NULL;
 }
 
-void tree_sitter_external_extra_tokens_external_scanner_destroy(
-  void *payload) {}
-
-void tree_sitter_external_extra_tokens_external_scanner_reset(
-  void *payload) {}
+void tree_sitter_external_extra_tokens_external_scanner_destroy(void *payload) {}
 
 unsigned tree_sitter_external_extra_tokens_external_scanner_serialize(
   void *payload,
@@ -30,7 +26,6 @@ bool tree_sitter_external_extra_tokens_external_scanner_scan(
   TSLexer *lexer,
   const bool *valid_symbols
 ) {
-
   while (lexer->lookahead == ' ') {
     lexer->advance(lexer, true);
   }
diff --git a/test/fixtures/test_grammars/external_tokens/scanner.c b/test/fixtures/test_grammars/external_tokens/scanner.c
index 163ae51b..f07bb850 100644
--- a/test/fixtures/test_grammars/external_tokens/scanner.c
+++ b/test/fixtures/test_grammars/external_tokens/scanner.c
@@ -1,3 +1,4 @@
+#include "tree_sitter/alloc.h"
 #include "tree_sitter/parser.h"
 
 enum {
@@ -13,7 +14,7 @@ typedef struct {
 } Scanner;
 
 void *tree_sitter_external_tokens_external_scanner_create() {
-  Scanner *scanner = malloc(sizeof(Scanner));
+  Scanner *scanner = ts_malloc(sizeof(Scanner));
   *scanner = (Scanner) {
     .open_delimiter = 0,
     .close_delimiter = 0,
@@ -23,11 +24,9 @@ void *tree_sitter_external_tokens_external_scanner_create() {
 }
 
 void tree_sitter_external_tokens_external_scanner_destroy(void *payload) {
-  free(payload);
+  ts_free(payload);
 }
 
-void tree_sitter_external_tokens_external_scanner_reset(void *payload) {}
-
 unsigned tree_sitter_external_tokens_external_scanner_serialize(
   void *payload,
   char *buffer
@@ -40,10 +39,10 @@ void tree_sitter_external_tokens_external_scanner_deserialize(
 ) {}
 
 bool tree_sitter_external_tokens_external_scanner_scan(
-  void *payload, TSLexer *lexer, const bool *whitelist) {
+  void *payload, TSLexer *lexer, const bool *valid_symbols) {
   Scanner *scanner = payload;
 
-  if (whitelist[percent_string]) {
+  if (valid_symbols[percent_string]) {
     while (lexer->lookahead == ' ' ||
            lexer->lookahead == '\t' ||
            lexer->lookahead == '\n' ||
@@ -97,7 +96,7 @@ bool tree_sitter_external_tokens_external_scanner_scan(
 
       lexer->advance(lexer, false);
     }
-  } else if (whitelist[percent_string_end]) {
+  } else if (valid_symbols[percent_string_end]) {
     if (lexer->lookahead != '}') return false;
     lexer->advance(lexer, false);
 
diff --git a/test/fixtures/test_grammars/external_unicode_column_alignment/scanner.c b/test/fixtures/test_grammars/external_unicode_column_alignment/scanner.c
index 3380bba2..b2218e97 100644
--- a/test/fixtures/test_grammars/external_unicode_column_alignment/scanner.c
+++ b/test/fixtures/test_grammars/external_unicode_column_alignment/scanner.c
@@ -1,3 +1,4 @@
+#include "tree_sitter/alloc.h"
 #include "tree_sitter/parser.h"
 
 #include <wctype.h>
@@ -14,15 +15,15 @@ typedef struct {
 } Scanner;
 
 void *tree_sitter_external_unicode_column_alignment_external_scanner_create() {
-  Scanner *scanner = malloc(sizeof(Scanner));
+  Scanner *scanner = ts_malloc(sizeof(Scanner));
   *scanner = (Scanner){
-    .column = -1 
+    .column = -1
   };
   return scanner;
 }
 
 void tree_sitter_external_unicode_column_alignment_external_scanner_destroy(void *payload) {
-  free(payload);
+  ts_free(payload);
 }
 
 unsigned tree_sitter_external_unicode_column_alignment_external_scanner_serialize(
@@ -50,7 +51,7 @@ void tree_sitter_external_unicode_column_alignment_external_scanner_deserialize(
 bool tree_sitter_external_unicode_column_alignment_external_scanner_scan(
   void *payload,
   TSLexer *lexer,
-  const bool *whitelist
+  const bool *valid_symbols
 ) {
   Scanner *scanner = payload;
   // U+25A1 is unicode codepoint □
diff --git a/test/fixtures/test_grammars/inverted_external_token/scanner.c b/test/fixtures/test_grammars/inverted_external_token/scanner.c
index 33fde6d1..8d7aa8f7 100644
--- a/test/fixtures/test_grammars/inverted_external_token/scanner.c
+++ b/test/fixtures/test_grammars/inverted_external_token/scanner.c
@@ -8,8 +8,6 @@ void *tree_sitter_inverted_external_token_external_scanner_create() { return NUL
 
 void tree_sitter_inverted_external_token_external_scanner_destroy(void *payload) {}
 
-void tree_sitter_inverted_external_token_external_scanner_reset(void *payload) {}
-
 unsigned tree_sitter_inverted_external_token_external_scanner_serialize(
   void *payload,
   char *buffer
@@ -22,7 +20,10 @@ void tree_sitter_inverted_external_token_external_scanner_deserialize(
 ) {}
 
 bool tree_sitter_inverted_external_token_external_scanner_scan(
-  void *payload, TSLexer *lexer, const bool *whitelist) {
+  void *payload,
+  TSLexer *lexer,
+  const bool *valid_symbols
+) {
   while (lexer->lookahead == ' ' || lexer->lookahead == '\r') {
     lexer->advance(lexer, true);
   }
diff --git a/test/fixtures/test_grammars/uses_current_column/scanner.c b/test/fixtures/test_grammars/uses_current_column/scanner.c
index b2b59281..4be1e124 100644
--- a/test/fixtures/test_grammars/uses_current_column/scanner.c
+++ b/test/fixtures/test_grammars/uses_current_column/scanner.c
@@ -1,3 +1,4 @@
+#include "tree_sitter/alloc.h"
 #include "tree_sitter/parser.h"
 
 #include <stdlib.h>
@@ -16,7 +17,7 @@ typedef struct {
 } Scanner;
 
 void *tree_sitter_uses_current_column_external_scanner_create() {
-  Scanner *self = malloc(sizeof(Scanner));
+  Scanner *self = ts_malloc(sizeof(Scanner));
   self->queued_dedent_count = 0;
   self->indent_count = 1;
   self->indents[0] = 0;
@@ -24,7 +25,7 @@ void *tree_sitter_uses_current_column_external_scanner_create() {
 }
 
 void tree_sitter_uses_current_column_external_scanner_destroy(void *payload) {
-  free(payload);
+  ts_free(payload);
 }
 
 unsigned tree_sitter_uses_current_column_external_scanner_serialize(