Scheme: autogenerate lists of builtins

This enriches the space of recognized builtins.

Note that this also fixes the space after a builtin being included in
the token.

7 files changed, 4300 insertions, 1604 deletions

diff --git a/external/scheme-builtins-generator.scm b/external/scheme-builtins-generator.scm
new file mode 100644
index 00000000..5c260b81
--- /dev/null
+++ b/external/scheme-builtins-generator.scm
@@ -0,0 +1,116 @@
+;; Autogenerate a list of Scheme keywords (i.e., macros) and built-in
+;; functions. This is written for the Guile implementation. The
+;; principle of autogenerating this has the advantage of catching many
+;; builtins that would be tedious to maintain by hand, and the
+;; disadvantage that some builtins very specific to Guile and not
+;; relevant to other implementations are caught as well. However,
+;; since Scheme builtin function names tend to be rather specific,
+;; this should not be a significant problem.
+
+(define port (open-output-file "../pygments/lexers/_scheme_builtins.py"))
+
+(display
+   "\"\"\"
+    pygments.lexers._scheme_builtins
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Scheme builtins.
+
+    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+\"\"\"
+"
+   port)
+
+(format port
+"\n# Autogenerated by external/scheme-builtins-generator.scm\n\
+# using Guile ~a.\n\n"
+        (version))
+
+(use-modules (srfi srfi-1)
+             (ice-9 match))
+
+(define relevant-modules
+  ;; This is a nightmare. Scheme builtins are split in
+  ;; gazillions of standards, SRFIs and implementation
+  ;; extensions. With so many sources, it's hard to define
+  ;; what is really a Scheme builtin. This is a rather
+  ;; conservative list of Guile modules that might be used
+  ;; the most frequently (somewhat subjective, admittedly).
+  '(
+    ;; The real builtins.
+    (guile)
+    ;; Let's include the fundamental list library.
+    (srfi srfi-1)
+    ;; define-record-type
+    (srfi srfi-9)
+    ;; let-values, let*-values
+    (srfi srfi-11)
+    ;; case-lambda
+    (srfi srfi-16)
+    ;; Pattern matching
+    (ice-9 match)
+    ;; Included for compatibility with files written for R5RS
+    (rnrs r5rs)))
+
+(define (get-all-bindings module)
+  ;; Need to recurse to find all public bindings. module-map
+  ;; only considers the module's own bindings.
+  (let* ((own (module-map cons module))
+        (uses (module-uses module)))
+    (append own (append-map get-all-bindings uses))))
+
+(define all-bindings
+  (append-map
+   ;; Need to use module-public-interface to restrict to
+   ;; public bindings.  Note that module-uses already
+   ;; returns public interfaces.
+   (lambda (mod-path)
+     (let* ((mod-object (resolve-module mod-path))
+            (iface (module-public-interface mod-object)))
+       (get-all-bindings iface)))
+   relevant-modules))
+
+(define (filter-for pred)
+  (filter-map
+   (match-lambda
+    ((key . variable)
+      (and (variable-bound? variable)
+           (let ((value (variable-ref variable)))
+             (and (pred value)
+                  key)))))
+   all-bindings))
+
+(define (sort-and-uniq lst pred)
+  (let loop ((lst (sort lst pred))
+             (acc '()))
+    (match lst
+     (() (reverse! acc))
+     ((one . rest)
+      (loop (drop-while (lambda (elt)
+                          (equal? elt one))
+                        rest)
+            (cons one acc))))))
+
+(define (dump-py-list lst)
+  (string-join
+   (map
+    (lambda (name)
+      (format #f "    \"~a\"," name))
+    (sort-and-uniq
+     (map symbol->string lst)
+     string<?))
+   "\n"))
+
+(define (dump-builtins name pred extra)
+  (format port
+          "~a = {\n~a\n}\n\n"
+          name
+          (dump-py-list (append extra (filter-for pred)))))
+
+(define extra-procedures
+  ;; These are found in RnRS but not implemented by Guile.
+ '(load transcript-off transcript-on))
+
+(dump-builtins 'scheme_keywords macro? '())
+(dump-builtins 'scheme_builtins procedure? extra-procedures)
diff --git a/pygments/lexers/_scheme_builtins.py b/pygments/lexers/_scheme_builtins.py
new file mode 100644
index 00000000..44535119
--- /dev/null
+++ b/pygments/lexers/_scheme_builtins.py
@@ -0,0 +1,1609 @@
+"""
+    pygments.lexers._scheme_builtins
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Scheme builtins.
+
+    :copyright: Copyright 2006-2022 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+# Autogenerated by external/scheme-builtins-generator.scm
+# using Guile 3.0.5.130-5a1e7.
+
+scheme_keywords = {
+    "*unspecified*",
+    "...",
+    "=>",
+    "@",
+    "@@",
+    "_",
+    "add-to-load-path",
+    "and",
+    "begin",
+    "begin-deprecated",
+    "case",
+    "case-lambda",
+    "case-lambda*",
+    "cond",
+    "cond-expand",
+    "current-filename",
+    "current-source-location",
+    "debug-set!",
+    "define",
+    "define*",
+    "define-inlinable",
+    "define-library",
+    "define-macro",
+    "define-module",
+    "define-once",
+    "define-option-interface",
+    "define-private",
+    "define-public",
+    "define-record-type",
+    "define-syntax",
+    "define-syntax-parameter",
+    "define-syntax-rule",
+    "define-values",
+    "defmacro",
+    "defmacro-public",
+    "delay",
+    "do",
+    "else",
+    "eval-when",
+    "export",
+    "export!",
+    "export-syntax",
+    "false-if-exception",
+    "identifier-syntax",
+    "if",
+    "import",
+    "include",
+    "include-ci",
+    "include-from-path",
+    "include-library-declarations",
+    "lambda",
+    "lambda*",
+    "let",
+    "let*",
+    "let*-values",
+    "let-syntax",
+    "let-values",
+    "letrec",
+    "letrec*",
+    "letrec-syntax",
+    "library",
+    "load",
+    "match",
+    "match-lambda",
+    "match-lambda*",
+    "match-let",
+    "match-let*",
+    "match-letrec",
+    "or",
+    "parameterize",
+    "print-set!",
+    "quasiquote",
+    "quasisyntax",
+    "quote",
+    "quote-syntax",
+    "re-export",
+    "re-export-syntax",
+    "read-set!",
+    "require-extension",
+    "set!",
+    "start-stack",
+    "syntax",
+    "syntax-case",
+    "syntax-error",
+    "syntax-parameterize",
+    "syntax-rules",
+    "unless",
+    "unquote",
+    "unquote-splicing",
+    "unsyntax",
+    "unsyntax-splicing",
+    "use-modules",
+    "when",
+    "while",
+    "with-ellipsis",
+    "with-fluids",
+    "with-syntax",
+    "λ",
+}
+
+scheme_builtins = {
+    "$sc-dispatch",
+    "%char-set-dump",
+    "%get-pre-modules-obarray",
+    "%get-stack-size",
+    "%global-site-dir",
+    "%init-rdelim-builtins",
+    "%init-rw-builtins",
+    "%library-dir",
+    "%load-announce",
+    "%load-hook",
+    "%make-void-port",
+    "%package-data-dir",
+    "%port-property",
+    "%print-module",
+    "%resolve-variable",
+    "%search-load-path",
+    "%set-port-property!",
+    "%site-ccache-dir",
+    "%site-dir",
+    "%start-stack",
+    "%string-dump",
+    "%symbol-dump",
+    "%warn-auto-compilation-enabled",
+    "*",
+    "+",
+    "-",
+    "->bool",
+    "->char-set",
+    "/",
+    "1+",
+    "1-",
+    "<",
+    "<=",
+    "=",
+    ">",
+    ">=",
+    "abort-to-prompt",
+    "abort-to-prompt*",
+    "abs",
+    "absolute-file-name?",
+    "accept",
+    "access?",
+    "acons",
+    "acos",
+    "acosh",
+    "add-hook!",
+    "addrinfo:addr",
+    "addrinfo:canonname",
+    "addrinfo:fam",
+    "addrinfo:flags",
+    "addrinfo:protocol",
+    "addrinfo:socktype",
+    "adjust-port-revealed!",
+    "alarm",
+    "alist-cons",
+    "alist-copy",
+    "alist-delete",
+    "alist-delete!",
+    "allocate-struct",
+    "and-map",
+    "and=>",
+    "angle",
+    "any",
+    "append",
+    "append!",
+    "append-map",
+    "append-map!",
+    "append-reverse",
+    "append-reverse!",
+    "apply",
+    "array->list",
+    "array-cell-ref",
+    "array-cell-set!",
+    "array-contents",
+    "array-copy!",
+    "array-copy-in-order!",
+    "array-dimensions",
+    "array-equal?",
+    "array-fill!",
+    "array-for-each",
+    "array-in-bounds?",
+    "array-index-map!",
+    "array-length",
+    "array-map!",
+    "array-map-in-order!",
+    "array-rank",
+    "array-ref",
+    "array-set!",
+    "array-shape",
+    "array-slice",
+    "array-slice-for-each",
+    "array-slice-for-each-in-order",
+    "array-type",
+    "array-type-code",
+    "array?",
+    "ash",
+    "asin",
+    "asinh",
+    "assert-load-verbosity",
+    "assoc",
+    "assoc-ref",
+    "assoc-remove!",
+    "assoc-set!",
+    "assq",
+    "assq-ref",
+    "assq-remove!",
+    "assq-set!",
+    "assv",
+    "assv-ref",
+    "assv-remove!",
+    "assv-set!",
+    "atan",
+    "atanh",
+    "autoload-done!",
+    "autoload-done-or-in-progress?",
+    "autoload-in-progress!",
+    "backtrace",
+    "basename",
+    "batch-mode?",
+    "beautify-user-module!",
+    "bind",
+    "bind-textdomain-codeset",
+    "bindtextdomain",
+    "bit-count",
+    "bit-count*",
+    "bit-extract",
+    "bit-invert!",
+    "bit-position",
+    "bit-set*!",
+    "bitvector",
+    "bitvector->list",
+    "bitvector-bit-clear?",
+    "bitvector-bit-set?",
+    "bitvector-clear-all-bits!",
+    "bitvector-clear-bit!",
+    "bitvector-clear-bits!",
+    "bitvector-count",
+    "bitvector-count-bits",
+    "bitvector-fill!",
+    "bitvector-flip-all-bits!",
+    "bitvector-length",
+    "bitvector-position",
+    "bitvector-ref",
+    "bitvector-set!",
+    "bitvector-set-all-bits!",
+    "bitvector-set-bit!",
+    "bitvector-set-bits!",
+    "bitvector?",
+    "boolean?",
+    "bound-identifier=?",
+    "break",
+    "break!",
+    "caaaar",
+    "caaadr",
+    "caaar",
+    "caadar",
+    "caaddr",
+    "caadr",
+    "caar",
+    "cadaar",
+    "cadadr",
+    "cadar",
+    "caddar",
+    "cadddr",
+    "caddr",
+    "cadr",
+    "call-with-blocked-asyncs",
+    "call-with-current-continuation",
+    "call-with-deferred-observers",
+    "call-with-include-port",
+    "call-with-input-file",
+    "call-with-input-string",
+    "call-with-module-autoload-lock",
+    "call-with-output-file",
+    "call-with-output-string",
+    "call-with-port",
+    "call-with-prompt",
+    "call-with-unblocked-asyncs",
+    "call-with-values",
+    "call/cc",
+    "canonicalize-path",
+    "car",
+    "car+cdr",
+    "catch",
+    "cdaaar",
+    "cdaadr",
+    "cdaar",
+    "cdadar",
+    "cdaddr",
+    "cdadr",
+    "cdar",
+    "cddaar",
+    "cddadr",
+    "cddar",
+    "cdddar",
+    "cddddr",
+    "cdddr",
+    "cddr",
+    "cdr",
+    "ceiling",
+    "ceiling-quotient",
+    "ceiling-remainder",
+    "ceiling/",
+    "centered-quotient",
+    "centered-remainder",
+    "centered/",
+    "char->integer",
+    "char-alphabetic?",
+    "char-ci<=?",
+    "char-ci<?",
+    "char-ci=?",
+    "char-ci>=?",
+    "char-ci>?",
+    "char-downcase",
+    "char-general-category",
+    "char-is-both?",
+    "char-lower-case?",
+    "char-numeric?",
+    "char-ready?",
+    "char-set",
+    "char-set->list",
+    "char-set->string",
+    "char-set-adjoin",
+    "char-set-adjoin!",
+    "char-set-any",
+    "char-set-complement",
+    "char-set-complement!",
+    "char-set-contains?",
+    "char-set-copy",
+    "char-set-count",
+    "char-set-cursor",
+    "char-set-cursor-next",
+    "char-set-delete",
+    "char-set-delete!",
+    "char-set-diff+intersection",
+    "char-set-diff+intersection!",
+    "char-set-difference",
+    "char-set-difference!",
+    "char-set-every",
+    "char-set-filter",
+    "char-set-filter!",
+    "char-set-fold",
+    "char-set-for-each",
+    "char-set-hash",
+    "char-set-intersection",
+    "char-set-intersection!",
+    "char-set-map",
+    "char-set-ref",
+    "char-set-size",
+    "char-set-unfold",
+    "char-set-unfold!",
+    "char-set-union",
+    "char-set-union!",
+    "char-set-xor",
+    "char-set-xor!",
+    "char-set<=",
+    "char-set=",
+    "char-set?",
+    "char-titlecase",
+    "char-upcase",
+    "char-upper-case?",
+    "char-whitespace?",
+    "char<=?",
+    "char<?",
+    "char=?",
+    "char>=?",
+    "char>?",
+    "char?",
+    "chdir",
+    "chmod",
+    "chown",
+    "chroot",
+    "circular-list",
+    "circular-list?",
+    "close",
+    "close-fdes",
+    "close-input-port",
+    "close-output-port",
+    "close-port",
+    "closedir",
+    "command-line",
+    "complex?",
+    "compose",
+    "concatenate",
+    "concatenate!",
+    "cond-expand-provide",
+    "connect",
+    "cons",
+    "cons*",
+    "cons-source",
+    "const",
+    "convert-assignment",
+    "copy-file",
+    "copy-random-state",
+    "copy-tree",
+    "cos",
+    "cosh",
+    "count",
+    "crypt",
+    "ctermid",
+    "current-dynamic-state",
+    "current-error-port",
+    "current-input-port",
+    "current-language",
+    "current-load-port",
+    "current-module",
+    "current-output-port",
+    "current-time",
+    "current-warning-port",
+    "datum->random-state",
+    "datum->syntax",
+    "debug-disable",
+    "debug-enable",
+    "debug-options",
+    "debug-options-interface",
+    "default-duplicate-binding-handler",
+    "default-duplicate-binding-procedures",
+    "default-prompt-tag",
+    "define!",
+    "define-module*",
+    "defined?",
+    "delete",
+    "delete!",
+    "delete-duplicates",
+    "delete-duplicates!",
+    "delete-file",
+    "delete1!",
+    "delq",
+    "delq!",
+    "delq1!",
+    "delv",
+    "delv!",
+    "delv1!",
+    "denominator",
+    "directory-stream?",
+    "dirname",
+    "display",
+    "display-application",
+    "display-backtrace",
+    "display-error",
+    "dotted-list?",
+    "doubly-weak-hash-table?",
+    "drain-input",
+    "drop",
+    "drop-right",
+    "drop-right!",
+    "drop-while",
+    "dup",
+    "dup->fdes",
+    "dup->inport",
+    "dup->outport",
+    "dup->port",
+    "dup2",
+    "duplicate-port",
+    "dynamic-call",
+    "dynamic-func",
+    "dynamic-link",
+    "dynamic-object?",
+    "dynamic-pointer",
+    "dynamic-state?",
+    "dynamic-unlink",
+    "dynamic-wind",
+    "effective-version",
+    "eighth",
+    "end-of-char-set?",
+    "endgrent",
+    "endhostent",
+    "endnetent",
+    "endprotoent",
+    "endpwent",
+    "endservent",
+    "ensure-batch-mode!",
+    "environ",
+    "eof-object?",
+    "eq?",
+    "equal?",
+    "eqv?",
+    "error",
+    "euclidean-quotient",
+    "euclidean-remainder",
+    "euclidean/",
+    "eval",
+    "eval-string",
+    "even?",
+    "every",
+    "exact->inexact",
+    "exact-integer-sqrt",
+    "exact-integer?",
+    "exact?",
+    "exception-accessor",
+    "exception-args",
+    "exception-kind",
+    "exception-predicate",
+    "exception-type?",
+    "exception?",
+    "execl",
+    "execle",
+    "execlp",
+    "exit",
+    "exp",
+    "expt",
+    "f32vector",
+    "f32vector->list",
+    "f32vector-length",
+    "f32vector-ref",
+    "f32vector-set!",
+    "f32vector?",
+    "f64vector",
+    "f64vector->list",
+    "f64vector-length",
+    "f64vector-ref",
+    "f64vector-set!",
+    "f64vector?",
+    "fcntl",
+    "fdes->inport",
+    "fdes->outport",
+    "fdes->ports",
+    "fdopen",
+    "fifth",
+    "file-encoding",
+    "file-exists?",
+    "file-is-directory?",
+    "file-name-separator?",
+    "file-port?",
+    "file-position",
+    "file-set-position",
+    "fileno",
+    "filter",
+    "filter!",
+    "filter-map",
+    "find",
+    "find-tail",
+    "finite?",
+    "first",
+    "flock",
+    "floor",
+    "floor-quotient",
+    "floor-remainder",
+    "floor/",
+    "fluid->parameter",
+    "fluid-bound?",
+    "fluid-ref",
+    "fluid-ref*",
+    "fluid-set!",
+    "fluid-thread-local?",
+    "fluid-unset!",
+    "fluid?",
+    "flush-all-ports",
+    "fold",
+    "fold-right",
+    "for-each",
+    "force",
+    "force-output",
+    "format",
+    "fourth",
+    "frame-address",
+    "frame-arguments",
+    "frame-dynamic-link",
+    "frame-instruction-pointer",
+    "frame-previous",
+    "frame-procedure-name",
+    "frame-return-address",
+    "frame-source",
+    "frame-stack-pointer",
+    "frame?",
+    "free-identifier=?",
+    "fsync",
+    "ftell",
+    "gai-strerror",
+    "gc",
+    "gc-disable",
+    "gc-dump",
+    "gc-enable",
+    "gc-run-time",
+    "gc-stats",
+    "gcd",
+    "generate-temporaries",
+    "gensym",
+    "get-internal-real-time",
+    "get-internal-run-time",
+    "get-output-string",
+    "get-print-state",
+    "getaddrinfo",
+    "getaffinity",
+    "getcwd",
+    "getegid",
+    "getenv",
+    "geteuid",
+    "getgid",
+    "getgr",
+    "getgrent",
+    "getgrgid",
+    "getgrnam",
+    "getgroups",
+    "gethost",
+    "gethostbyaddr",
+    "gethostbyname",
+    "gethostent",
+    "gethostname",
+    "getitimer",
+    "getlogin",
+    "getnet",
+    "getnetbyaddr",
+    "getnetbyname",
+    "getnetent",
+    "getpass",
+    "getpeername",
+    "getpgrp",
+    "getpid",
+    "getppid",
+    "getpriority",
+    "getproto",
+    "getprotobyname",
+    "getprotobynumber",
+    "getprotoent",
+    "getpw",
+    "getpwent",
+    "getpwnam",
+    "getpwuid",
+    "getrlimit",
+    "getserv",
+    "getservbyname",
+    "getservbyport",
+    "getservent",
+    "getsid",
+    "getsockname",
+    "getsockopt",
+    "gettext",
+    "gettimeofday",
+    "getuid",
+    "gmtime",
+    "group:gid",
+    "group:mem",
+    "group:name",
+    "group:passwd",
+    "hash",
+    "hash-clear!",
+    "hash-count",
+    "hash-create-handle!",
+    "hash-fold",
+    "hash-for-each",
+    "hash-for-each-handle",
+    "hash-get-handle",
+    "hash-map->list",
+    "hash-ref",
+    "hash-remove!",
+    "hash-set!",
+    "hash-table?",
+    "hashq",
+    "hashq-create-handle!",
+    "hashq-get-handle",
+    "hashq-ref",
+    "hashq-remove!",
+    "hashq-set!",
+    "hashv",
+    "hashv-create-handle!",
+    "hashv-get-handle",
+    "hashv-ref",
+    "hashv-remove!",
+    "hashv-set!",
+    "hashx-create-handle!",
+    "hashx-get-handle",
+    "hashx-ref",
+    "hashx-remove!",
+    "hashx-set!",
+    "hook->list",
+    "hook-empty?",
+    "hook?",
+    "hostent:addr-list",
+    "hostent:addrtype",
+    "hostent:aliases",
+    "hostent:length",
+    "hostent:name",
+    "identifier?",
+    "identity",
+    "imag-part",
+    "in-vicinity",
+    "include-deprecated-features",
+    "inet-lnaof",
+    "inet-makeaddr",
+    "inet-netof",
+    "inet-ntop",
+    "inet-pton",
+    "inexact->exact",
+    "inexact?",
+    "inf",
+    "inf?",
+    "inherit-print-state",
+    "input-port?",
+    "install-r6rs!",
+    "install-r7rs!",
+    "integer->char",
+    "integer-expt",
+    "integer-length",
+    "integer?",
+    "interaction-environment",
+    "iota",
+    "isatty?",
+    "issue-deprecation-warning",
+    "keyword->symbol",
+    "keyword-like-symbol->keyword",
+    "keyword?",
+    "kill",
+    "kw-arg-ref",
+    "last",
+    "last-pair",
+    "lcm",
+    "length",
+    "length+",
+    "link",
+    "list",
+    "list->array",
+    "list->bitvector",
+    "list->char-set",
+    "list->char-set!",
+    "list->f32vector",
+    "list->f64vector",
+    "list->s16vector",
+    "list->s32vector",
+    "list->s64vector",
+    "list->s8vector",
+    "list->string",
+    "list->symbol",
+    "list->typed-array",
+    "list->u16vector",
+    "list->u32vector",
+    "list->u64vector",
+    "list->u8vector",
+    "list->vector",
+    "list-cdr-ref",
+    "list-cdr-set!",
+    "list-copy",
+    "list-head",
+    "list-index",
+    "list-ref",
+    "list-set!",
+    "list-tabulate",
+    "list-tail",
+    "list=",
+    "list?",
+    "listen",
+    "load-compiled",
+    "load-extension",
+    "load-from-path",
+    "load-in-vicinity",
+    "load-user-init",
+    "local-define",
+    "local-define-module",
+    "local-ref",
+    "local-ref-module",
+    "local-remove",
+    "local-set!",
+    "localtime",
+    "log",
+    "log10",
+    "logand",
+    "logbit?",
+    "logcount",
+    "logior",
+    "lognot",
+    "logtest",
+    "logxor",
+    "lookup-duplicates-handlers",
+    "lset-adjoin",
+    "lset-diff+intersection",
+    "lset-diff+intersection!",
+    "lset-difference",
+    "lset-difference!",
+    "lset-intersection",
+    "lset-intersection!",
+    "lset-union",
+    "lset-union!",
+    "lset-xor",
+    "lset-xor!",
+    "lset<=",
+    "lset=",
+    "lstat",
+    "macro-binding",
+    "macro-name",
+    "macro-transformer",
+    "macro-type",
+    "macro?",
+    "macroexpand",
+    "macroexpanded?",
+    "magnitude",
+    "major-version",
+    "make-array",
+    "make-autoload-interface",
+    "make-bitvector",
+    "make-doubly-weak-hash-table",
+    "make-exception",
+    "make-exception-from-throw",
+    "make-exception-type",
+    "make-f32vector",
+    "make-f64vector",
+    "make-fluid",
+    "make-fresh-user-module",
+    "make-generalized-vector",
+    "make-guardian",
+    "make-hash-table",
+    "make-hook",
+    "make-list",
+    "make-module",
+    "make-modules-in",
+    "make-mutable-parameter",
+    "make-object-property",
+    "make-parameter",
+    "make-polar",
+    "make-procedure-with-setter",
+    "make-promise",
+    "make-prompt-tag",
+    "make-record-type",
+    "make-rectangular",
+    "make-regexp",
+    "make-s16vector",
+    "make-s32vector",
+    "make-s64vector",
+    "make-s8vector",
+    "make-shared-array",
+    "make-socket-address",
+    "make-soft-port",
+    "make-srfi-4-vector",
+    "make-stack",
+    "make-string",
+    "make-struct-layout",
+    "make-struct/no-tail",
+    "make-struct/simple",
+    "make-symbol",
+    "make-syntax-transformer",
+    "make-thread-local-fluid",
+    "make-typed-array",
+    "make-u16vector",
+    "make-u32vector",
+    "make-u64vector",
+    "make-u8vector",
+    "make-unbound-fluid",
+    "make-undefined-variable",
+    "make-variable",
+    "make-variable-transformer",
+    "make-vector",
+    "make-vtable",
+    "make-weak-key-hash-table",
+    "make-weak-value-hash-table",
+    "map",
+    "map!",
+    "map-in-order",
+    "max",
+    "member",
+    "memoize-expression",
+    "memoized-typecode",
+    "memq",
+    "memv",
+    "merge",
+    "merge!",
+    "micro-version",
+    "min",
+    "minor-version",
+    "mkdir",
+    "mkdtemp",
+    "mknod",
+    "mkstemp",
+    "mkstemp!",
+    "mktime",
+    "module-add!",
+    "module-autoload!",
+    "module-binder",
+    "module-bound?",
+    "module-call-observers",
+    "module-clear!",
+    "module-constructor",
+    "module-declarative?",
+    "module-defer-observers",
+    "module-define!",
+    "module-define-submodule!",
+    "module-defined?",
+    "module-duplicates-handlers",
+    "module-ensure-local-variable!",
+    "module-export!",
+    "module-export-all!",
+    "module-filename",
+    "module-for-each",
+    "module-generate-unique-id!",
+    "module-gensym",
+    "module-import-interface",
+    "module-import-obarray",
+    "module-kind",
+    "module-local-variable",
+    "module-locally-bound?",
+    "module-make-local-var!",
+    "module-map",
+    "module-modified",
+    "module-name",
+    "module-next-unique-id",
+    "module-obarray",
+    "module-obarray-get-handle",
+    "module-obarray-ref",
+    "module-obarray-remove!",
+    "module-obarray-set!",
+    "module-observe",
+    "module-observe-weak",
+    "module-observers",
+    "module-public-interface",
+    "module-re-export!",
+    "module-ref",
+    "module-ref-submodule",
+    "module-remove!",
+    "module-replace!",
+    "module-replacements",
+    "module-reverse-lookup",
+    "module-search",
+    "module-set!",
+    "module-submodule-binder",
+    "module-submodules",
+    "module-symbol-binding",
+    "module-symbol-interned?",
+    "module-symbol-local-binding",
+    "module-symbol-locally-interned?",
+    "module-transformer",
+    "module-unobserve",
+    "module-use!",
+    "module-use-interfaces!",
+    "module-uses",
+    "module-variable",
+    "module-version",
+    "module-weak-observers",
+    "module?",
+    "modulo",
+    "modulo-expt",
+    "move->fdes",
+    "nan",
+    "nan?",
+    "negate",
+    "negative?",
+    "nested-define!",
+    "nested-define-module!",
+    "nested-ref",
+    "nested-ref-module",
+    "nested-remove!",
+    "nested-set!",
+    "netent:addrtype",
+    "netent:aliases",
+    "netent:name",
+    "netent:net",
+    "newline",
+    "ngettext",
+    "nice",
+    "nil?",
+    "ninth",
+    "noop",
+    "not",
+    "not-pair?",
+    "null-environment",
+    "null-list?",
+    "null?",
+    "number->string",
+    "number?",
+    "numerator",
+    "object->string",
+    "object-address",
+    "object-properties",
+    "object-property",
+    "odd?",
+    "open",
+    "open-fdes",
+    "open-file",
+    "open-input-file",
+    "open-input-string",
+    "open-io-file",
+    "open-output-file",
+    "open-output-string",
+    "opendir",
+    "or-map",
+    "output-port?",
+    "pair-fold",
+    "pair-fold-right",
+    "pair-for-each",
+    "pair?",
+    "parameter-converter",
+    "parameter-fluid",
+    "parameter?",
+    "parse-path",
+    "parse-path-with-ellipsis",
+    "partition",
+    "partition!",
+    "passwd:dir",
+    "passwd:gecos",
+    "passwd:gid",
+    "passwd:name",
+    "passwd:passwd",
+    "passwd:shell",
+    "passwd:uid",
+    "pause",
+    "peek",
+    "peek-char",
+    "pipe",
+    "pk",
+    "port->fdes",
+    "port-closed?",
+    "port-column",
+    "port-conversion-strategy",
+    "port-encoding",
+    "port-filename",
+    "port-for-each",
+    "port-line",
+    "port-mode",
+    "port-revealed",
+    "port-with-print-state",
+    "port?",
+    "positive?",
+    "primitive-_exit",
+    "primitive-eval",
+    "primitive-exit",
+    "primitive-fork",
+    "primitive-load",
+    "primitive-load-path",
+    "primitive-move->fdes",
+    "primitive-read",
+    "print-disable",
+    "print-enable",
+    "print-exception",
+    "print-options",
+    "print-options-interface",
+    "procedure",
+    "procedure-documentation",
+    "procedure-minimum-arity",
+    "procedure-name",
+    "procedure-properties",
+    "procedure-property",
+    "procedure-source",
+    "procedure-with-setter?",
+    "procedure?",
+    "process-use-modules",
+    "program-arguments",
+    "promise?",
+    "proper-list?",
+    "protoent:aliases",
+    "protoent:name",
+    "protoent:proto",
+    "provide",
+    "provided?",
+    "purify-module!",
+    "putenv",
+    "quit",
+    "quotient",
+    "raise",
+    "raise-exception",
+    "random",
+    "random-state->datum",
+    "random-state-from-platform",
+    "random:exp",
+    "random:hollow-sphere!",
+    "random:normal",
+    "random:normal-vector!",
+    "random:solid-sphere!",
+    "random:uniform",
+    "rational?",
+    "rationalize",
+    "read",
+    "read-char",
+    "read-disable",
+    "read-enable",
+    "read-hash-extend",
+    "read-hash-procedure",
+    "read-hash-procedures",
+    "read-options",
+    "read-options-interface",
+    "read-syntax",
+    "readdir",
+    "readlink",
+    "real-part",
+    "real?",
+    "record-accessor",
+    "record-constructor",
+    "record-modifier",
+    "record-predicate",
+    "record-type-constructor",
+    "record-type-descriptor",
+    "record-type-extensible?",
+    "record-type-fields",
+    "record-type-has-parent?",
+    "record-type-mutable-fields",
+    "record-type-name",
+    "record-type-opaque?",
+    "record-type-parent",
+    "record-type-parents",
+    "record-type-properties",
+    "record-type-uid",
+    "record-type?",
+    "record?",
+    "recv!",
+    "recvfrom!",
+    "redirect-port",
+    "reduce",
+    "reduce-right",
+    "regexp-exec",
+    "regexp?",
+    "release-port-handle",
+    "reload-module",
+    "remainder",
+    "remove",
+    "remove!",
+    "remove-hook!",
+    "rename-file",
+    "repl-reader",
+    "reset-hook!",
+    "resolve-interface",
+    "resolve-module",
+    "resolve-r6rs-interface",
+    "restore-signals",
+    "restricted-vector-sort!",
+    "reverse",
+    "reverse!",
+    "reverse-list->string",
+    "rewinddir",
+    "rmdir",
+    "round",
+    "round-ash",
+    "round-quotient",
+    "round-remainder",
+    "round/",
+    "run-hook",
+    "s16vector",
+    "s16vector->list",
+    "s16vector-length",
+    "s16vector-ref",
+    "s16vector-set!",
+    "s16vector?",
+    "s32vector",
+    "s32vector->list",
+    "s32vector-length",
+    "s32vector-ref",
+    "s32vector-set!",
+    "s32vector?",
+    "s64vector",
+    "s64vector->list",
+    "s64vector-length",
+    "s64vector-ref",
+    "s64vector-set!",
+    "s64vector?",
+    "s8vector",
+    "s8vector->list",
+    "s8vector-length",
+    "s8vector-ref",
+    "s8vector-set!",
+    "s8vector?",
+    "save-module-excursion",
+    "scheme-report-environment",
+    "scm-error",
+    "search-path",
+    "second",
+    "seed->random-state",
+    "seek",
+    "select",
+    "self-evaluating?",
+    "send",
+    "sendfile",
+    "sendto",
+    "servent:aliases",
+    "servent:name",
+    "servent:port",
+    "servent:proto",
+    "set-autoloaded!",
+    "set-car!",
+    "set-cdr!",
+    "set-current-dynamic-state",
+    "set-current-error-port",
+    "set-current-input-port",
+    "set-current-module",
+    "set-current-output-port",
+    "set-exception-printer!",
+    "set-module-binder!",
+    "set-module-declarative?!",
+    "set-module-duplicates-handlers!",
+    "set-module-filename!",
+    "set-module-kind!",
+    "set-module-name!",
+    "set-module-next-unique-id!",
+    "set-module-obarray!",
+    "set-module-observers!",
+    "set-module-public-interface!",
+    "set-module-submodule-binder!",
+    "set-module-submodules!",
+    "set-module-transformer!",
+    "set-module-uses!",
+    "set-module-version!",
+    "set-object-properties!",
+    "set-object-property!",
+    "set-port-column!",
+    "set-port-conversion-strategy!",
+    "set-port-encoding!",
+    "set-port-filename!",
+    "set-port-line!",
+    "set-port-revealed!",
+    "set-procedure-minimum-arity!",
+    "set-procedure-properties!",
+    "set-procedure-property!",
+    "set-program-arguments",
+    "set-source-properties!",
+    "set-source-property!",
+    "set-struct-vtable-name!",
+    "set-symbol-property!",
+    "set-tm:gmtoff",
+    "set-tm:hour",
+    "set-tm:isdst",
+    "set-tm:mday",
+    "set-tm:min",
+    "set-tm:mon",
+    "set-tm:sec",
+    "set-tm:wday",
+    "set-tm:yday",
+    "set-tm:year",
+    "set-tm:zone",
+    "setaffinity",
+    "setegid",
+    "setenv",
+    "seteuid",
+    "setgid",
+    "setgr",
+    "setgrent",
+    "setgroups",
+    "sethost",
+    "sethostent",
+    "sethostname",
+    "setitimer",
+    "setlocale",
+    "setnet",
+    "setnetent",
+    "setpgid",
+    "setpriority",
+    "setproto",
+    "setprotoent",
+    "setpw",
+    "setpwent",
+    "setrlimit",
+    "setserv",
+    "setservent",
+    "setsid",
+    "setsockopt",
+    "setter",
+    "setuid",
+    "setvbuf",
+    "seventh",
+    "shared-array-increments",
+    "shared-array-offset",
+    "shared-array-root",
+    "shutdown",
+    "sigaction",
+    "simple-exceptions",
+    "simple-format",
+    "sin",
+    "sinh",
+    "sixth",
+    "sleep",
+    "sloppy-assoc",
+    "sloppy-assq",
+    "sloppy-assv",
+    "sockaddr:addr",
+    "sockaddr:fam",
+    "sockaddr:flowinfo",
+    "sockaddr:path",
+    "sockaddr:port",
+    "sockaddr:scopeid",
+    "socket",
+    "socketpair",
+    "sort",
+    "sort!",
+    "sort-list",
+    "sort-list!",
+    "sorted?",
+    "source-properties",
+    "source-property",
+    "span",
+    "span!",
+    "split-at",
+    "split-at!",
+    "sqrt",
+    "stable-sort",
+    "stable-sort!",
+    "stack-id",
+    "stack-length",
+    "stack-ref",
+    "stack?",
+    "stat",
+    "stat:atime",
+    "stat:atimensec",
+    "stat:blksize",
+    "stat:blocks",
+    "stat:ctime",
+    "stat:ctimensec",
+    "stat:dev",
+    "stat:gid",
+    "stat:ino",
+    "stat:mode",
+    "stat:mtime",
+    "stat:mtimensec",
+    "stat:nlink",
+    "stat:perms",
+    "stat:rdev",
+    "stat:size",
+    "stat:type",
+    "stat:uid",
+    "status:exit-val",
+    "status:stop-sig",
+    "status:term-sig",
+    "strerror",
+    "strftime",
+    "string",
+    "string->char-set",
+    "string->char-set!",
+    "string->list",
+    "string->number",
+    "string->symbol",
+    "string-any",
+    "string-any-c-code",
+    "string-append",
+    "string-append/shared",
+    "string-bytes-per-char",
+    "string-capitalize",
+    "string-capitalize!",
+    "string-ci->symbol",
+    "string-ci<",
+    "string-ci<=",
+    "string-ci<=?",
+    "string-ci<>",
+    "string-ci<?",
+    "string-ci=",
+    "string-ci=?",
+    "string-ci>",
+    "string-ci>=",
+    "string-ci>=?",
+    "string-ci>?",
+    "string-compare",
+    "string-compare-ci",
+    "string-concatenate",
+    "string-concatenate-reverse",
+    "string-concatenate-reverse/shared",
+    "string-concatenate/shared",
+    "string-contains",
+    "string-contains-ci",
+    "string-copy",
+    "string-copy!",
+    "string-count",
+    "string-delete",
+    "string-downcase",
+    "string-downcase!",
+    "string-drop",
+    "string-drop-right",
+    "string-every",
+    "string-every-c-code",
+    "string-fill!",
+    "string-filter",
+    "string-fold",
+    "string-fold-right",
+    "string-for-each",
+    "string-for-each-index",
+    "string-hash",
+    "string-hash-ci",
+    "string-index",
+    "string-index-right",
+    "string-join",
+    "string-length",
+    "string-map",
+    "string-map!",
+    "string-normalize-nfc",
+    "string-normalize-nfd",
+    "string-normalize-nfkc",
+    "string-normalize-nfkd",
+    "string-null?",
+    "string-pad",
+    "string-pad-right",
+    "string-prefix-ci?",
+    "string-prefix-length",
+    "string-prefix-length-ci",
+    "string-prefix?",
+    "string-ref",
+    "string-replace",
+    "string-reverse",
+    "string-reverse!",
+    "string-rindex",
+    "string-set!",
+    "string-skip",
+    "string-skip-right",
+    "string-split",
+    "string-suffix-ci?",
+    "string-suffix-length",
+    "string-suffix-length-ci",
+    "string-suffix?",
+    "string-tabulate",
+    "string-take",
+    "string-take-right",
+    "string-titlecase",
+    "string-titlecase!",
+    "string-tokenize",
+    "string-trim",
+    "string-trim-both",
+    "string-trim-right",
+    "string-unfold",
+    "string-unfold-right",
+    "string-upcase",
+    "string-upcase!",
+    "string-utf8-length",
+    "string-xcopy!",
+    "string<",
+    "string<=",
+    "string<=?",
+    "string<>",
+    "string<?",
+    "string=",
+    "string=?",
+    "string>",
+    "string>=",
+    "string>=?",
+    "string>?",
+    "string?",
+    "strptime",
+    "struct-layout",
+    "struct-ref",
+    "struct-ref/unboxed",
+    "struct-set!",
+    "struct-set!/unboxed",
+    "struct-vtable",
+    "struct-vtable-name",
+    "struct-vtable?",
+    "struct?",
+    "substring",
+    "substring-fill!",
+    "substring-move!",
+    "substring/copy",
+    "substring/read-only",
+    "substring/shared",
+    "supports-source-properties?",
+    "symbol",
+    "symbol->keyword",
+    "symbol->string",
+    "symbol-append",
+    "symbol-fref",
+    "symbol-fset!",
+    "symbol-hash",
+    "symbol-interned?",
+    "symbol-pref",
+    "symbol-prefix-proc",
+    "symbol-property",
+    "symbol-property-remove!",
+    "symbol-pset!",
+    "symbol?",
+    "symlink",
+    "sync",
+    "syntax->datum",
+    "syntax-source",
+    "syntax-violation",
+    "system",
+    "system*",
+    "system-async-mark",
+    "system-error-errno",
+    "system-file-name-convention",
+    "take",
+    "take!",
+    "take-right",
+    "take-while",
+    "take-while!",
+    "tan",
+    "tanh",
+    "tcgetpgrp",
+    "tcsetpgrp",
+    "tenth",
+    "textdomain",
+    "third",
+    "throw",
+    "thunk?",
+    "times",
+    "tm:gmtoff",
+    "tm:hour",
+    "tm:isdst",
+    "tm:mday",
+    "tm:min",
+    "tm:mon",
+    "tm:sec",
+    "tm:wday",
+    "tm:yday",
+    "tm:year",
+    "tm:zone",
+    "tmpfile",
+    "tmpnam",
+    "tms:clock",
+    "tms:cstime",
+    "tms:cutime",
+    "tms:stime",
+    "tms:utime",
+    "transpose-array",
+    "truncate",
+    "truncate-file",
+    "truncate-quotient",
+    "truncate-remainder",
+    "truncate/",
+    "try-load-module",
+    "try-module-autoload",
+    "ttyname",
+    "typed-array?",
+    "tzset",
+    "u16vector",
+    "u16vector->list",
+    "u16vector-length",
+    "u16vector-ref",
+    "u16vector-set!",
+    "u16vector?",
+    "u32vector",
+    "u32vector->list",
+    "u32vector-length",
+    "u32vector-ref",
+    "u32vector-set!",
+    "u32vector?",
+    "u64vector",
+    "u64vector->list",
+    "u64vector-length",
+    "u64vector-ref",
+    "u64vector-set!",
+    "u64vector?",
+    "u8vector",
+    "u8vector->list",
+    "u8vector-length",
+    "u8vector-ref",
+    "u8vector-set!",
+    "u8vector?",
+    "ucs-range->char-set",
+    "ucs-range->char-set!",
+    "umask",
+    "uname",
+    "unfold",
+    "unfold-right",
+    "unmemoize-expression",
+    "unread-char",
+    "unread-string",
+    "unsetenv",
+    "unspecified?",
+    "unzip1",
+    "unzip2",
+    "unzip3",
+    "unzip4",
+    "unzip5",
+    "use-srfis",
+    "user-modules-declarative?",
+    "using-readline?",
+    "usleep",
+    "utime",
+    "utsname:machine",
+    "utsname:nodename",
+    "utsname:release",
+    "utsname:sysname",
+    "utsname:version",
+    "values",
+    "variable-bound?",
+    "variable-ref",
+    "variable-set!",
+    "variable-unset!",
+    "variable?",
+    "vector",
+    "vector->list",
+    "vector-copy",
+    "vector-fill!",
+    "vector-length",
+    "vector-move-left!",
+    "vector-move-right!",
+    "vector-ref",
+    "vector-set!",
+    "vector?",
+    "version",
+    "version-matches?",
+    "waitpid",
+    "warn",
+    "weak-key-hash-table?",
+    "weak-value-hash-table?",
+    "with-continuation-barrier",
+    "with-dynamic-state",
+    "with-error-to-file",
+    "with-error-to-port",
+    "with-error-to-string",
+    "with-exception-handler",
+    "with-fluid*",
+    "with-fluids*",
+    "with-input-from-file",
+    "with-input-from-port",
+    "with-input-from-string",
+    "with-output-to-file",
+    "with-output-to-port",
+    "with-output-to-string",
+    "with-throw-handler",
+    "write",
+    "write-char",
+    "xcons",
+    "xsubstring",
+    "zero?",
+    "zip",
+}
+
diff --git a/pygments/lexers/lisp.py b/pygments/lexers/lisp.py
index 7e5dadb2..7d457d3c 100644
--- a/pygments/lexers/lisp.py
+++ b/pygments/lexers/lisp.py
@@ -16,17 +16,15 @@ from pygments.token import Text, Comment, Operator, Keyword, Name, String, \
 
 from pygments.lexers.python import PythonLexer
 
+from pygments.lexers._scheme_builtins import scheme_keywords, scheme_builtins
+
 __all__ = ['SchemeLexer', 'CommonLispLexer', 'HyLexer', 'RacketLexer',
            'NewLispLexer', 'EmacsLispLexer', 'ShenLexer', 'CPSALexer',
            'XtlangLexer', 'FennelLexer']
 
-
 class SchemeLexer(RegexLexer):
     """
-    A Scheme lexer, parsing a stream and outputting the tokens
-    needed to highlight scheme code.
-    This lexer could be most probably easily subclassed to parse
-    other LISP-Dialects like Common Lisp, Emacs Lisp or AutoLisp.
+    A Scheme lexer.
 
     This parser is checked with pastes from the LISP pastebin
     at http://paste.lisp.org/ to cover as much syntax as possible.
@@ -41,60 +39,25 @@ class SchemeLexer(RegexLexer):
     mimetypes = ['text/x-scheme', 'application/x-scheme']
 
     flags = re.DOTALL | re.MULTILINE
-    # list of known keywords and builtins taken form vim 6.4 scheme.vim
-    # syntax file.
-    keywords = (
-        'lambda', 'define', 'if', 'else', 'cond', 'and', 'or', 'case', 'let',
-        'let*', 'letrec', 'begin', 'do', 'delay', 'set!', '=>', 'quote',
-        'quasiquote', 'unquote', 'unquote-splicing', 'define-syntax',
-        'let-syntax', 'letrec-syntax', 'syntax-rules'
-    )
-    builtins = (
-        '*', '+', '-', '/', '<', '<=', '=', '>', '>=', 'abs', 'acos', 'angle',
-        'append', 'apply', 'asin', 'assoc', 'assq', 'assv', 'atan',
-        'boolean?', 'caaaar', 'caaadr', 'caaar', 'caadar', 'caaddr', 'caadr',
-        'caar', 'cadaar', 'cadadr', 'cadar', 'caddar', 'cadddr', 'caddr',
-        'cadr', 'call-with-current-continuation', 'call-with-input-file',
-        'call-with-output-file', 'call-with-values', 'call/cc', 'car',
-        'cdaaar', 'cdaadr', 'cdaar', 'cdadar', 'cdaddr', 'cdadr', 'cdar',
-        'cddaar', 'cddadr', 'cddar', 'cdddar', 'cddddr', 'cdddr', 'cddr',
-        'cdr', 'ceiling', 'char->integer', 'char-alphabetic?', 'char-ci<=?',
-        'char-ci<?', 'char-ci=?', 'char-ci>=?', 'char-ci>?', 'char-downcase',
-        'char-lower-case?', 'char-numeric?', 'char-ready?', 'char-upcase',
-        'char-upper-case?', 'char-whitespace?', 'char<=?', 'char<?', 'char=?',
-        'char>=?', 'char>?', 'char?', 'close-input-port', 'close-output-port',
-        'complex?', 'cons', 'cos', 'current-input-port', 'current-output-port',
-        'denominator', 'display', 'dynamic-wind', 'eof-object?', 'eq?',
-        'equal?', 'eqv?', 'eval', 'even?', 'exact->inexact', 'exact?', 'exp',
-        'expt', 'floor', 'for-each', 'force', 'gcd', 'imag-part',
-        'inexact->exact', 'inexact?', 'input-port?', 'integer->char',
-        'integer?', 'interaction-environment', 'lcm', 'length', 'list',
-        'list->string', 'list->vector', 'list-ref', 'list-tail', 'list?',
-        'load', 'log', 'magnitude', 'make-polar', 'make-rectangular',
-        'make-string', 'make-vector', 'map', 'max', 'member', 'memq', 'memv',
-        'min', 'modulo', 'negative?', 'newline', 'not', 'null-environment',
-        'null?', 'number->string', 'number?', 'numerator', 'odd?',
-        'open-input-file', 'open-output-file', 'output-port?', 'pair?',
-        'peek-char', 'port?', 'positive?', 'procedure?', 'quotient',
-        'rational?', 'rationalize', 'read', 'read-char', 'real-part', 'real?',
-        'remainder', 'reverse', 'round', 'scheme-report-environment',
-        'set-car!', 'set-cdr!', 'sin', 'sqrt', 'string', 'string->list',
-        'string->number', 'string->symbol', 'string-append', 'string-ci<=?',
-        'string-ci<?', 'string-ci=?', 'string-ci>=?', 'string-ci>?',
-        'string-copy', 'string-fill!', 'string-length', 'string-ref',
-        'string-set!', 'string<=?', 'string<?', 'string=?', 'string>=?',
-        'string>?', 'string?', 'substring', 'symbol->string', 'symbol?',
-        'tan', 'transcript-off', 'transcript-on', 'truncate', 'values',
-        'vector', 'vector->list', 'vector-fill!', 'vector-length',
-        'vector-ref', 'vector-set!', 'vector?', 'with-input-from-file',
-        'with-output-to-file', 'write', 'write-char', 'zero?'
-    )
 
     # valid names for identifiers
     # well, names can only not consist fully of numbers
     # but this should be good enough for now
     valid_name = r'[\w!$%&*+,/:<=>?@^~|-]+'
 
+    # Recognizing builtins.
+    def get_tokens_unprocessed(self, text):
+        for index, token, value in super().get_tokens_unprocessed(text):
+            if token is Name.Function or token is Name.Variable:
+                if value in scheme_keywords:
+                    yield index, Keyword, value
+                elif value in scheme_builtins:
+                    yield index, Name.Builtin, value
+                else:
+                    yield index, token, value
+            else:
+                yield index, token, value
+
     # Scheme has funky syntactic rules for numbers. These are all
     # valid number literals: 5.0e55|14, 14/13, -1+5j, +1@5, #b110,
     # #o#Iinf.0-nan.0i.  This is adapted from the formal grammar given
@@ -263,23 +226,16 @@ class SchemeLexer(RegexLexer):
             # special operators
             (r"('|#|`|,@|,|\.)", Operator),
 
-            # highlight the keywords
-            ('(%s)' % '|'.join(re.escape(entry) + ' ' for entry in keywords),
-             Keyword,
-             '#pop'),
-
             # first variable in a quoted string like
             # '(this is syntactic sugar)
             (r"(?<='\()" + valid_name, Name.Variable, '#pop'),
             (r"(?<=#\()" + valid_name, Name.Variable, '#pop'),
 
-            # highlight the builtins
-            (r"(?<=\()(%s)" % '|'.join(re.escape(entry) + ' ' for entry in builtins),
-             Name.Builtin,
-             '#pop'),
-
-            # the remaining functions
+            # Functions -- note that this also catches variables
+            # defined in let/let*, but there is little that can
+            # be done about it.
             (r'(?<=\()' + valid_name, Name.Function, '#pop'),
+
             # find the remaining variables
             (valid_name, Name.Variable, '#pop'),
 
diff --git a/tests/examplefiles/lilypond/example.ly.output b/tests/examplefiles/lilypond/example.ly.output
index e82aa6a4..3527b83a 100644
--- a/tests/examplefiles/lilypond/example.ly.output
+++ b/tests/examplefiles/lilypond/example.ly.output
@@ -131,13 +131,14 @@
 ')'           Punctuation
 '\n   '       Text
 '('           Punctuation
-'let* '       Keyword
+'let*'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'repeated'    Name.Function
 ' '           Text
 '('           Punctuation
-'make-list'   Name.Function
+'make-list'   Name.Builtin.SchemeBuiltin
 ' '           Text
 'n'           Name.Variable
 ' '           Text
@@ -149,7 +150,8 @@
 'copied'      Name.Function
 ' '           Text
 '('           Punctuation
-'map '        Name.Builtin.SchemeBuiltin
+'map'         Name.Builtin.SchemeBuiltin
+' '           Text
 'ly:music-deep-copy' Name.Builtin.SchemeFunction
 ' '           Text
 'repeated'    Name.Variable
@@ -301,7 +303,7 @@
 
 '#'           Punctuation
 '('           Punctuation
-'symbol->string' Name.Variable
+'symbol->string' Name.Builtin.SchemeBuiltin
 ' '           Text
 "'some-symbol" Literal.String.Symbol
 ')'           Punctuation
diff --git a/tests/examplefiles/scheme/boot-9.scm.output b/tests/examplefiles/scheme/boot-9.scm.output
index a2c17b04..699f2468 100644
--- a/tests/examplefiles/scheme/boot-9.scm.output
+++ b/tests/examplefiles/scheme/boot-9.scm.output
@@ -161,32 +161,38 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
-'begin-deprecated' Name.Variable
+'define'      Keyword
+' '           Text
+'begin-deprecated' Keyword
 '\n  '        Text
 '('           Punctuation
 'procedure->memoizing-macro' Name.Function
 '\n   '       Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
-'exp '        Name.Builtin
+'exp'         Name.Builtin
+' '           Text
 'env'         Name.Variable
 ')'           Punctuation
 '\n     '     Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'include-deprecated-features' Name.Function
+'include-deprecated-features' Name.Builtin
 ')'           Punctuation
 '\n\t '       Text
 '`'           Operator
 '('           Punctuation
-'begin '      Keyword
+'begin'       Keyword
+' '           Text
 ',@'          Operator
 '('           Punctuation
-'cdr '        Name.Builtin
-'exp'         Name.Variable
+'cdr'         Name.Builtin
+' '           Text
+'exp'         Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 '\n\t '       Text
@@ -205,19 +211,23 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'provide'     Name.Function
+'provide'     Name.Builtin
 ' '           Text
 'sym'         Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'memq '       Name.Builtin
+'memq'        Name.Builtin
+' '           Text
 'sym'         Name.Variable
 ' '           Text
 '*features*'  Name.Variable
@@ -225,11 +235,13 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'set! '       Keyword
+'set!'        Keyword
+' '           Text
 '*features*'  Name.Variable
 ' '           Text
 '('           Punctuation
-'cons '       Name.Builtin
+'cons'        Name.Builtin
+' '           Text
 'sym'         Name.Variable
 ' '           Text
 '*features*'  Name.Variable
@@ -249,17 +261,20 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'provided?'   Name.Function
+'provided?'   Name.Builtin
 ' '           Text
 'feature'     Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'memq '       Name.Builtin
+'memq'        Name.Builtin
+' '           Text
 'feature'     Name.Variable
 ' '           Text
 '*features*'  Name.Variable
@@ -271,10 +286,11 @@
 '\n\n'        Text
 
 '('           Punctuation
-'begin-deprecated' Name.Function
+'begin-deprecated' Keyword
 '\n '         Text
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'feature?'    Name.Function
 ' '           Text
@@ -282,7 +298,7 @@
 ')'           Punctuation
 '\n   '       Text
 '('           Punctuation
-'issue-deprecation-warning' Name.Function
+'issue-deprecation-warning' Name.Builtin
 '\n    '      Text
 '"'           Literal.String
 "`feature?' is deprecated.  Use `provided?' instead." Literal.String
@@ -290,7 +306,7 @@
 ')'           Punctuation
 '\n   '       Text
 '('           Punctuation
-'provided?'   Name.Function
+'provided?'   Name.Builtin
 ' '           Text
 'sym'         Name.Variable
 ')'           Punctuation
@@ -302,10 +318,11 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'format'      Name.Variable
+'define'      Keyword
 ' '           Text
-'simple-format' Name.Variable
+'format'      Name.Builtin
+' '           Text
+'simple-format' Name.Builtin
 ')'           Punctuation
 '\n\n\x0c\n'  Text
 
@@ -313,7 +330,7 @@
 '\n\n'        Text
 
 '('           Punctuation
-'primitive-load-path' Name.Function
+'primitive-load-path' Name.Builtin
 ' '           Text
 '"'           Literal.String
 'ice-9/r4rs.scm' Literal.String
@@ -352,9 +369,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'peek'        Name.Function
+'peek'        Name.Builtin
 ' '           Text
 '.'           Operator
 ' '           Text
@@ -362,29 +380,32 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'newline'     Name.Function
+'newline'     Name.Builtin
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '"'           Literal.String
 ';;; '        Literal.String
 '"'           Literal.String
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'write '      Name.Builtin
+'write'       Name.Builtin
+' '           Text
 'stuff'       Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'newline'     Name.Function
+'newline'     Name.Builtin
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 '('           Punctuation
-'last-pair'   Name.Function
+'last-pair'   Name.Builtin
 ' '           Text
 'stuff'       Name.Variable
 ')'           Punctuation
@@ -393,17 +414,19 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
-'pk'          Name.Variable
+'define'      Keyword
+' '           Text
+'pk'          Name.Builtin
 ' '           Text
-'peek'        Name.Variable
+'peek'        Name.Builtin
 ')'           Punctuation
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'warn'        Name.Function
+'warn'        Name.Builtin
 ' '           Text
 '.'           Operator
 ' '           Text
@@ -411,41 +434,45 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'with-output-to-port' Name.Function
+'with-output-to-port' Name.Builtin
 ' '           Text
 '('           Punctuation
-'current-error-port' Name.Function
+'current-error-port' Name.Builtin
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'newline'     Name.Function
+'newline'     Name.Builtin
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '"'           Literal.String
 ';;; WARNING ' Literal.String
 '"'           Literal.String
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 'stuff'       Name.Variable
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'newline'     Name.Function
+'newline'     Name.Builtin
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 '('           Punctuation
-'last-pair'   Name.Function
+'last-pair'   Name.Builtin
 ' '           Text
 'stuff'       Name.Variable
 ')'           Punctuation
@@ -462,9 +489,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'identity'    Name.Function
+'identity'    Name.Builtin
 ' '           Text
 'x'           Name.Variable
 ')'           Punctuation
@@ -474,15 +502,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'1+'          Name.Function
+'1+'          Name.Builtin
 ' '           Text
 'n'           Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 'n'           Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
@@ -491,15 +521,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'1-'          Name.Function
+'1-'          Name.Builtin
 ' '           Text
 'n'           Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 'n'           Name.Variable
 ' '           Text
 '-1'          Literal.Number.Integer
@@ -508,21 +540,23 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'and=>'       Name.Function
+'and=>'       Name.Builtin
 ' '           Text
 'value'       Name.Variable
 ' '           Text
-'procedure'   Name.Variable
+'procedure'   Name.Builtin
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 'value'       Name.Variable
 ' '           Text
 '('           Punctuation
-'procedure'   Name.Function
+'procedure'   Name.Builtin
 ' '           Text
 'value'       Name.Variable
 ')'           Punctuation
@@ -531,15 +565,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'make-hash-table' Name.Function
+'make-hash-table' Name.Builtin
 ' '           Text
 'k'           Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'make-vector ' Name.Builtin
+'make-vector' Name.Builtin
+' '           Text
 'k'           Name.Variable
 ' '           Text
 "'"           Operator
@@ -550,10 +586,11 @@
 '\n\n'        Text
 
 '('           Punctuation
-'begin-deprecated' Name.Function
+'begin-deprecated' Keyword
 '\n '         Text
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'id'          Name.Function
 ' '           Text
@@ -561,7 +598,7 @@
 ')'           Punctuation
 '\n   '       Text
 '('           Punctuation
-'issue-deprecation-warning' Name.Function
+'issue-deprecation-warning' Name.Builtin
 ' '           Text
 '"'           Literal.String
 "`id' is deprecated.  Use `identity' instead." Literal.String
@@ -569,14 +606,15 @@
 ')'           Punctuation
 '\n   '       Text
 '('           Punctuation
-'identity'    Name.Function
+'identity'    Name.Builtin
 ' '           Text
 'x'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n '         Text
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 '-1+'         Name.Function
 ' '           Text
@@ -584,7 +622,7 @@
 ')'           Punctuation
 '\n   '       Text
 '('           Punctuation
-'issue-deprecation-warning' Name.Function
+'issue-deprecation-warning' Name.Builtin
 ' '           Text
 '"'           Literal.String
 "`-1+' is deprecated.  Use `1-' instead." Literal.String
@@ -592,14 +630,15 @@
 ')'           Punctuation
 '\n   '       Text
 '('           Punctuation
-'1-'          Name.Function
+'1-'          Name.Builtin
 ' '           Text
 'n'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n '         Text
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'return-it'   Name.Function
 ' '           Text
@@ -609,7 +648,7 @@
 ')'           Punctuation
 '\n   '       Text
 '('           Punctuation
-'issue-deprecation-warning' Name.Function
+'issue-deprecation-warning' Name.Builtin
 ' '           Text
 '"'           Literal.String
 "`return-it' is deprecated.  Use `noop' instead." Literal.String
@@ -617,8 +656,9 @@
 ')'           Punctuation
 '\n   '       Text
 '('           Punctuation
-'apply '      Name.Builtin
-'noop'        Name.Variable
+'apply'       Name.Builtin
+' '           Text
+'noop'        Name.Builtin
 ' '           Text
 'args'        Name.Variable
 ')'           Punctuation
@@ -660,7 +700,8 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'apply-to-args' Name.Function
 ' '           Text
@@ -670,7 +711,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'apply '      Name.Builtin
+'apply'       Name.Builtin
+' '           Text
 'fn'          Name.Variable
 ' '           Text
 'args'        Name.Variable
@@ -685,7 +727,8 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'ipow-by-squaring' Name.Function
 ' '           Text
@@ -699,10 +742,12 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'cond '       Keyword
+'cond'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
-'zero? '      Name.Builtin
+'zero?'       Name.Builtin
+' '           Text
 'k'           Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -711,7 +756,8 @@
 '\n\t'        Text
 '('           Punctuation
 '('           Punctuation
-'= '          Name.Builtin
+'='           Name.Builtin
+' '           Text
 '1'           Literal.Number.Integer
 ' '           Text
 'k'           Name.Variable
@@ -727,7 +773,8 @@
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'else '       Keyword
+'else'        Keyword
+' '           Text
 '('           Punctuation
 'ipow-by-squaring' Name.Function
 ' '           Text
@@ -740,16 +787,19 @@
 ')'           Punctuation
 '\n\t\t\t\t'  Text
 '('           Punctuation
-'quotient '   Name.Builtin
+'quotient'    Name.Builtin
+' '           Text
 'k'           Name.Variable
 ' '           Text
 '2'           Literal.Number.Integer
 ')'           Punctuation
 '\n\t\t\t\t'  Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'even? '      Name.Builtin
+'even?'       Name.Builtin
+' '           Text
 'k'           Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -772,10 +822,11 @@
 '\n\n'        Text
 
 '('           Punctuation
-'begin-deprecated' Name.Function
+'begin-deprecated' Keyword
 '\n '         Text
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'string-character-length' Name.Function
 ' '           Text
@@ -783,7 +834,7 @@
 ')'           Punctuation
 '\n   '       Text
 '('           Punctuation
-'issue-deprecation-warning' Name.Function
+'issue-deprecation-warning' Name.Builtin
 ' '           Text
 '"'           Literal.String
 "`string-character-length' is deprecated.  Use `string-length' instead." Literal.String
@@ -791,13 +842,15 @@
 ')'           Punctuation
 '\n   '       Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 's'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n '         Text
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'flags'       Name.Function
 ' '           Text
@@ -807,7 +860,7 @@
 ')'           Punctuation
 '\n   '       Text
 '('           Punctuation
-'issue-deprecation-warning' Name.Function
+'issue-deprecation-warning' Name.Builtin
 ' '           Text
 '"'           Literal.String
 "`flags' is deprecated.  Use `logior' instead." Literal.String
@@ -815,8 +868,9 @@
 ')'           Punctuation
 '\n   '       Text
 '('           Punctuation
-'apply '      Name.Builtin
-'logior'      Name.Variable
+'apply'       Name.Builtin
+' '           Text
+'logior'      Name.Builtin
 ' '           Text
 'args'        Name.Variable
 ')'           Punctuation
@@ -831,9 +885,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'symbol-property' Name.Function
+'symbol-property' Name.Builtin
 ' '           Text
 'sym'         Name.Variable
 ' '           Text
@@ -841,17 +896,19 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'pair'        Name.Function
 ' '           Text
 '('           Punctuation
-'assoc '      Name.Builtin
+'assoc'       Name.Builtin
+' '           Text
 'prop'        Name.Variable
 ' '           Text
 '('           Punctuation
-'symbol-pref' Name.Function
+'symbol-pref' Name.Builtin
 ' '           Text
 'sym'         Name.Variable
 ')'           Punctuation
@@ -860,11 +917,13 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 'pair'        Name.Variable
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'pair'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -873,9 +932,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'set-symbol-property!' Name.Function
+'set-symbol-property!' Name.Builtin
 ' '           Text
 'sym'         Name.Variable
 ' '           Text
@@ -885,17 +945,19 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'pair'        Name.Function
 ' '           Text
 '('           Punctuation
-'assoc '      Name.Builtin
+'assoc'       Name.Builtin
+' '           Text
 'prop'        Name.Variable
 ' '           Text
 '('           Punctuation
-'symbol-pref' Name.Function
+'symbol-pref' Name.Builtin
 ' '           Text
 'sym'         Name.Variable
 ')'           Punctuation
@@ -904,30 +966,32 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 'pair'        Name.Variable
 '\n\t'        Text
 '('           Punctuation
-'set-cdr! '   Name.Builtin
+'set-cdr!'    Name.Builtin
+' '           Text
 'pair'        Name.Variable
 ' '           Text
 'val'         Name.Variable
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'symbol-pset!' Name.Function
+'symbol-pset!' Name.Builtin
 ' '           Text
 'sym'         Name.Variable
 ' '           Text
 '('           Punctuation
-'acons'       Name.Function
+'acons'       Name.Builtin
 ' '           Text
 'prop'        Name.Variable
 ' '           Text
 'val'         Name.Variable
 ' '           Text
 '('           Punctuation
-'symbol-pref' Name.Function
+'symbol-pref' Name.Builtin
 ' '           Text
 'sym'         Name.Variable
 ')'           Punctuation
@@ -939,9 +1003,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'symbol-property-remove!' Name.Function
+'symbol-property-remove!' Name.Builtin
 ' '           Text
 'sym'         Name.Variable
 ' '           Text
@@ -949,17 +1014,19 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'pair'        Name.Function
 ' '           Text
 '('           Punctuation
-'assoc '      Name.Builtin
+'assoc'       Name.Builtin
+' '           Text
 'prop'        Name.Variable
 ' '           Text
 '('           Punctuation
-'symbol-pref' Name.Function
+'symbol-pref' Name.Builtin
 ' '           Text
 'sym'         Name.Variable
 ')'           Punctuation
@@ -968,21 +1035,22 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 'pair'        Name.Variable
 '\n\t'        Text
 '('           Punctuation
-'symbol-pset!' Name.Function
+'symbol-pset!' Name.Builtin
 ' '           Text
 'sym'         Name.Variable
 ' '           Text
 '('           Punctuation
-'delq!'       Name.Function
+'delq!'       Name.Builtin
 ' '           Text
 'pair'        Name.Variable
 ' '           Text
 '('           Punctuation
-'symbol-pref' Name.Function
+'symbol-pref' Name.Builtin
 ' '           Text
 'sym'         Name.Variable
 ')'           Punctuation
@@ -1006,13 +1074,15 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'make-object-property' Name.Function
+'make-object-property' Name.Builtin
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'prop'        Name.Function
@@ -1026,10 +1096,11 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'make-procedure-with-setter' Name.Function
+'make-procedure-with-setter' Name.Builtin
 '\n     '     Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'obj'         Name.Function
 ')'           Punctuation
@@ -1044,7 +1115,8 @@
 ')'           Punctuation
 '\n     '     Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'obj'         Name.Function
 ' '           Text
@@ -1073,15 +1145,16 @@
 '\n\n'        Text
 
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'provided?'   Name.Function
+'provided?'   Name.Builtin
 ' '           Text
 "'array"      Literal.String.Symbol
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'primitive-load-path' Name.Function
+'primitive-load-path' Name.Builtin
 ' '           Text
 '"'           Literal.String
 'ice-9/arrays.scm' Literal.String
@@ -1097,43 +1170,47 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'symbol->keyword' Name.Function
+'symbol->keyword' Name.Builtin
 ' '           Text
-'symbol'      Name.Variable
+'symbol'      Name.Builtin
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
 'make-keyword-from-dash-symbol' Name.Function
 ' '           Text
 '('           Punctuation
-'symbol-append' Name.Function
+'symbol-append' Name.Builtin
 ' '           Text
 "'-"          Literal.String.Symbol
 ' '           Text
-'symbol'      Name.Variable
+'symbol'      Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'keyword->symbol' Name.Function
+'keyword->symbol' Name.Builtin
 ' '           Text
 'kw'          Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'sym'         Name.Function
 ' '           Text
 '('           Punctuation
-'symbol->string ' Name.Builtin
+'symbol->string' Name.Builtin
+' '           Text
 '('           Punctuation
 'keyword-dash-symbol' Name.Function
 ' '           Text
@@ -1144,15 +1221,18 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'string->symbol ' Name.Builtin
+'string->symbol' Name.Builtin
+' '           Text
 '('           Punctuation
-'substring '  Name.Builtin
+'substring'   Name.Builtin
+' '           Text
 'sym'         Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
 ' '           Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 'sym'         Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -1162,9 +1242,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'kw-arg-ref'  Name.Function
+'kw-arg-ref'  Name.Builtin
 ' '           Text
 'args'        Name.Variable
 ' '           Text
@@ -1172,13 +1253,15 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'rem'         Name.Function
 ' '           Text
 '('           Punctuation
-'member '     Name.Builtin
+'member'      Name.Builtin
+' '           Text
 'kw'          Name.Variable
 ' '           Text
 'args'        Name.Variable
@@ -1187,19 +1270,23 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 'rem'         Name.Variable
 ' '           Text
 '('           Punctuation
-'pair? '      Name.Builtin
+'pair?'       Name.Builtin
+' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'rem'         Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'cadr '       Name.Builtin
+'cadr'        Name.Builtin
+' '           Text
 'rem'         Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -1211,18 +1298,19 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'struct-layout' Name.Function
+'struct-layout' Name.Builtin
 ' '           Text
 's'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'struct-ref'  Name.Function
+'struct-ref'  Name.Builtin
 ' '           Text
 '('           Punctuation
-'struct-vtable' Name.Function
+'struct-vtable' Name.Builtin
 ' '           Text
 's'           Name.Variable
 ')'           Punctuation
@@ -1236,14 +1324,16 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 'the-environment' Name.Variable
 '\n  '        Text
 '('           Punctuation
 'procedure->syntax' Name.Function
 '\n   '       Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'x'           Name.Function
 ' '           Text
@@ -1257,7 +1347,8 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 'the-root-environment' Name.Variable
 ' '           Text
 '('           Punctuation
@@ -1267,7 +1358,8 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'environment-module' Name.Function
 ' '           Text
@@ -1275,22 +1367,26 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'closure'     Name.Function
 ' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'pair? '      Name.Builtin
+'pair?'       Name.Builtin
+' '           Text
 'env'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 '('           Punctuation
-'last-pair'   Name.Function
+'last-pair'   Name.Builtin
 ' '           Text
 'env'         Name.Variable
 ')'           Punctuation
@@ -1300,11 +1396,12 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 'closure'     Name.Variable
 ' '           Text
 '('           Punctuation
-'procedure-property' Name.Function
+'procedure-property' Name.Builtin
 ' '           Text
 'closure'     Name.Variable
 ' '           Text
@@ -1355,9 +1452,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'inherit-print-state' Name.Function
+'inherit-print-state' Name.Builtin
 ' '           Text
 'old-port'    Name.Variable
 ' '           Text
@@ -1365,20 +1463,21 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'get-print-state' Name.Function
+'get-print-state' Name.Builtin
 ' '           Text
 'old-port'    Name.Variable
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'port-with-print-state' Name.Function
+'port-with-print-state' Name.Builtin
 ' '           Text
 'new-port'    Name.Variable
 ' '           Text
 '('           Punctuation
-'get-print-state' Name.Function
+'get-print-state' Name.Builtin
 ' '           Text
 'old-port'    Name.Variable
 ')'           Punctuation
@@ -1393,7 +1492,8 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 'record-type-vtable' Name.Variable
 '\n  '        Text
 '('           Punctuation
@@ -1406,7 +1506,8 @@
 '0'           Literal.Number.Integer
 '\n\t\t      ' Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 's'           Name.Function
 ' '           Text
@@ -1414,17 +1515,20 @@
 ')'           Punctuation
 '\n\t\t\t'    Text
 '('           Punctuation
-'cond '       Keyword
+'cond'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 's'           Name.Variable
 ' '           Text
 'record-type-vtable' Name.Variable
 ')'           Punctuation
 '\n\t\t\t       ' Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '"'           Literal.String
 '#<record-type-vtable>' Literal.String
 '"'           Literal.String
@@ -1434,10 +1538,11 @@
 ')'           Punctuation
 '\n\t\t\t      ' Text
 '('           Punctuation
-'else'        Name.Function
+'else'        Keyword
 '\n\t\t\t       ' Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '"'           Literal.String
 '#<record-type ' Literal.String
 '"'           Literal.String
@@ -1446,9 +1551,10 @@
 ')'           Punctuation
 '\n\t\t\t       ' Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '('           Punctuation
-'record-type-name' Name.Function
+'record-type-name' Name.Builtin
 ' '           Text
 's'           Name.Variable
 ')'           Punctuation
@@ -1457,7 +1563,8 @@
 ')'           Punctuation
 '\n\t\t\t       ' Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '"'           Literal.String
 '>'           Literal.String
 '"'           Literal.String
@@ -1472,27 +1579,30 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'record-type?' Name.Function
+'record-type?' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'struct?'     Name.Function
+'struct?'     Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 'record-type-vtable' Name.Variable
 ' '           Text
 '('           Punctuation
-'struct-vtable' Name.Function
+'struct-vtable' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
@@ -1502,9 +1612,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'make-record-type' Name.Function
+'make-record-type' Name.Builtin
 ' '           Text
 'type-name'   Name.Variable
 ' '           Text
@@ -1516,20 +1627,24 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'printer-fn'  Name.Function
 ' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'pair? '      Name.Builtin
+'pair?'       Name.Builtin
+' '           Text
 'opt'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'opt'         Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -1537,7 +1652,8 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'struct'      Name.Function
@@ -1550,16 +1666,19 @@
 '0'           Literal.Number.Integer
 '\n\t\t\t       ' Text
 '('           Punctuation
-'make-struct-layout' Name.Function
+'make-struct-layout' Name.Builtin
 '\n\t\t\t\t'  Text
 '('           Punctuation
-'apply '      Name.Builtin
-'string-append' Name.Variable
+'apply'       Name.Builtin
+' '           Text
+'string-append' Name.Builtin
 '\n\t\t\t\t       ' Text
 '('           Punctuation
-'map '        Name.Builtin
+'map'         Name.Builtin
+' '           Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'f'           Name.Function
 ')'           Punctuation
@@ -1575,11 +1694,13 @@
 ')'           Punctuation
 '\n\t\t\t       ' Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 'printer-fn'  Name.Variable
 '\n\t\t\t\t   ' Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 's'           Name.Function
 ' '           Text
@@ -1587,7 +1708,8 @@
 ')'           Punctuation
 '\n\t\t\t\t     ' Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '"'           Literal.String
 '#<'          Literal.String
 '"'           Literal.String
@@ -1596,14 +1718,16 @@
 ')'           Punctuation
 '\n\t\t\t\t     ' Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 'type-name'   Name.Variable
 ' '           Text
 'p'           Name.Variable
 ')'           Punctuation
 '\n\t\t\t\t     ' Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 'loop'        Name.Variable
 ' '           Text
 '('           Punctuation
@@ -1621,19 +1745,22 @@
 ')'           Punctuation
 '\n\t\t\t\t       ' Text
 '('           Punctuation
-'cond'        Name.Function
+'cond'        Keyword
 '\n\t\t\t\t\t' Text
 '('           Punctuation
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 'fields'      Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t\t\t\t\t ' Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '"'           Literal.String
 ' '           Literal.String
 '"'           Literal.String
@@ -1642,9 +1769,11 @@
 ')'           Punctuation
 '\n\t\t\t\t\t ' Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'fields'      Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -1652,7 +1781,8 @@
 ')'           Punctuation
 '\n\t\t\t\t\t ' Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '"'           Literal.String
 ': '          Literal.String
 '"'           Literal.String
@@ -1661,9 +1791,10 @@
 ')'           Punctuation
 '\n\t\t\t\t\t ' Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '('           Punctuation
-'struct-ref'  Name.Function
+'struct-ref'  Name.Builtin
 ' '           Text
 's'           Name.Variable
 ' '           Text
@@ -1677,12 +1808,14 @@
 'loop'        Name.Function
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'fields'      Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 '1'           Literal.Number.Integer
 ' '           Text
 'off'         Name.Variable
@@ -1693,7 +1826,8 @@
 ')'           Punctuation
 '\n\t\t\t\t     ' Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '"'           Literal.String
 '>'           Literal.String
 '"'           Literal.String
@@ -1706,7 +1840,7 @@
 'type-name'   Name.Variable
 '\n\t\t\t       ' Text
 '('           Punctuation
-'copy-tree'   Name.Function
+'copy-tree'   Name.Builtin
 ' '           Text
 'fields'      Name.Variable
 ')'           Punctuation
@@ -1719,21 +1853,24 @@
 ';; so that the object system can create a wrapper class for it.' Comment.Single
 '\n      '    Text
 '('           Punctuation
-'set-struct-vtable-name!' Name.Function
+'set-struct-vtable-name!' Name.Builtin
 ' '           Text
 'struct'      Name.Variable
 ' '           Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'symbol? '    Name.Builtin
+'symbol?'     Name.Builtin
+' '           Text
 'type-name'   Name.Variable
 ')'           Punctuation
 '\n\t\t\t\t\t  ' Text
 'type-name'   Name.Variable
 '\n\t\t\t\t\t  ' Text
 '('           Punctuation
-'string->symbol ' Name.Builtin
+'string->symbol' Name.Builtin
+' '           Text
 'type-name'   Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -1746,23 +1883,25 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'record-type-name' Name.Function
+'record-type-name' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'record-type?' Name.Function
+'record-type?' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'struct-ref'  Name.Function
+'struct-ref'  Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ' '           Text
@@ -1770,7 +1909,7 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 ' '           Text
 "'not-a-record-type" Literal.String.Symbol
 ' '           Text
@@ -1781,28 +1920,31 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'record-type-fields' Name.Function
+'record-type-fields' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'record-type?' Name.Function
+'record-type?' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'struct-ref'  Name.Function
+'struct-ref'  Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 '1'           Literal.Number.Integer
 ' '           Text
 'vtable-offset-user' Name.Variable
@@ -1810,7 +1952,7 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 ' '           Text
 "'not-a-record-type" Literal.String.Symbol
 ' '           Text
@@ -1821,9 +1963,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'record-constructor' Name.Function
+'record-constructor' Name.Builtin
 ' '           Text
 'rtd'         Name.Variable
 ' '           Text
@@ -1833,25 +1976,29 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'field-names' Name.Function
 ' '           Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'pair? '      Name.Builtin
+'pair?'       Name.Builtin
+' '           Text
 'opt'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'opt'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'record-type-fields' Name.Function
+'record-type-fields' Name.Builtin
 ' '           Text
 'rtd'         Name.Variable
 ')'           Punctuation
@@ -1864,7 +2011,8 @@
 ' '           Text
 '`'           Operator
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 ','           Operator
 'field-names' Name.Variable
 '\n\t\t   '   Text
@@ -1877,17 +2025,21 @@
 ' '           Text
 ',@'          Operator
 '('           Punctuation
-'map '        Name.Builtin
+'map'         Name.Builtin
+' '           Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'f'           Name.Function
 ')'           Punctuation
 '\n\t\t\t\t\t\t ' Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'memq '       Name.Builtin
+'memq'        Name.Builtin
+' '           Text
 'f'           Name.Variable
 ' '           Text
 'field-names' Name.Variable
@@ -1900,7 +2052,7 @@
 ')'           Punctuation
 '\n\t\t\t\t\t       ' Text
 '('           Punctuation
-'record-type-fields' Name.Function
+'record-type-fields' Name.Builtin
 ' '           Text
 'rtd'         Name.Variable
 ')'           Punctuation
@@ -1915,33 +2067,37 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'record-predicate' Name.Function
+'record-predicate' Name.Builtin
 ' '           Text
 'rtd'         Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'obj'         Name.Function
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'struct?'     Name.Function
+'struct?'     Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 'rtd'         Name.Variable
 ' '           Text
 '('           Punctuation
-'struct-vtable' Name.Function
+'struct-vtable' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
@@ -1952,9 +2108,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'record-accessor' Name.Function
+'record-accessor' Name.Builtin
 ' '           Text
 'rtd'         Name.Variable
 ' '           Text
@@ -1962,16 +2119,17 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let* '       Keyword
+'let*'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'pos'         Name.Function
 ' '           Text
 '('           Punctuation
-'list-index'  Name.Function
+'list-index'  Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-type-fields' Name.Function
+'record-type-fields' Name.Builtin
 ' '           Text
 'rtd'         Name.Variable
 ')'           Punctuation
@@ -1982,14 +2140,16 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 'pos'         Name.Variable
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 ' '           Text
 "'no-such-field" Literal.String.Symbol
 ' '           Text
@@ -2002,26 +2162,29 @@
 ' '           Text
 '`'           Operator
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'obj'         Name.Function
 ')'           Punctuation
 '\n\t\t   '   Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 "',rtd"       Literal.String.Symbol
 ' '           Text
 '('           Punctuation
-'record-type-descriptor' Name.Function
+'record-type-descriptor' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t\t\t'    Text
 '('           Punctuation
-'struct-ref'  Name.Function
+'struct-ref'  Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ' '           Text
@@ -2038,9 +2201,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'record-modifier' Name.Function
+'record-modifier' Name.Builtin
 ' '           Text
 'rtd'         Name.Variable
 ' '           Text
@@ -2048,16 +2212,17 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let* '       Keyword
+'let*'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'pos'         Name.Function
 ' '           Text
 '('           Punctuation
-'list-index'  Name.Function
+'list-index'  Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-type-fields' Name.Function
+'record-type-fields' Name.Builtin
 ' '           Text
 'rtd'         Name.Variable
 ')'           Punctuation
@@ -2068,14 +2233,16 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 'pos'         Name.Variable
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 ' '           Text
 "'no-such-field" Literal.String.Symbol
 ' '           Text
@@ -2088,7 +2255,8 @@
 ' '           Text
 '`'           Operator
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'obj'         Name.Function
 ' '           Text
@@ -2096,20 +2264,22 @@
 ')'           Punctuation
 '\n\t\t   '   Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 "',rtd"       Literal.String.Symbol
 ' '           Text
 '('           Punctuation
-'record-type-descriptor' Name.Function
+'record-type-descriptor' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t\t\t'    Text
 '('           Punctuation
-'struct-set!' Name.Function
+'struct-set!' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ' '           Text
@@ -2128,26 +2298,28 @@
 '\n\n\n'      Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'record?'     Name.Function
+'record?'     Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'struct?'     Name.Function
+'struct?'     Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'record-type?' Name.Function
+'record-type?' Name.Builtin
 ' '           Text
 '('           Punctuation
-'struct-vtable' Name.Function
+'struct-vtable' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
@@ -2157,29 +2329,31 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'record-type-descriptor' Name.Function
+'record-type-descriptor' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'struct?'     Name.Function
+'struct?'     Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'struct-vtable' Name.Function
+'struct-vtable' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 ' '           Text
 "'not-a-record" Literal.String.Symbol
 ' '           Text
@@ -2190,7 +2364,7 @@
 '\n\n'        Text
 
 '('           Punctuation
-'provide'     Name.Function
+'provide'     Name.Builtin
 ' '           Text
 "'record"     Literal.String.Symbol
 ')'           Punctuation
@@ -2203,17 +2377,20 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'->bool'      Name.Function
+'->bool'      Name.Builtin
 ' '           Text
 'x'           Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 'x'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -2227,9 +2404,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'symbol-append' Name.Function
+'symbol-append' Name.Builtin
 ' '           Text
 '.'           Operator
 ' '           Text
@@ -2237,14 +2415,17 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'string->symbol ' Name.Builtin
+'string->symbol' Name.Builtin
+' '           Text
 '('           Punctuation
-'apply '      Name.Builtin
-'string-append' Name.Variable
+'apply'       Name.Builtin
+' '           Text
+'string-append' Name.Builtin
 ' '           Text
 '('           Punctuation
-'map '        Name.Builtin
-'symbol->string' Name.Variable
+'map'         Name.Builtin
+' '           Text
+'symbol->string' Name.Builtin
 ' '           Text
 'args'        Name.Variable
 ')'           Punctuation
@@ -2254,9 +2435,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'list->symbol' Name.Function
+'list->symbol' Name.Builtin
 ' '           Text
 '.'           Operator
 ' '           Text
@@ -2264,10 +2446,12 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'string->symbol ' Name.Builtin
+'string->symbol' Name.Builtin
+' '           Text
 '('           Punctuation
-'apply '      Name.Builtin
-'list->string' Name.Variable
+'apply'       Name.Builtin
+' '           Text
+'list->string' Name.Builtin
 ' '           Text
 'args'        Name.Variable
 ')'           Punctuation
@@ -2276,9 +2460,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'symbol'      Name.Function
+'symbol'      Name.Builtin
 ' '           Text
 '.'           Operator
 ' '           Text
@@ -2286,10 +2471,12 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'string->symbol ' Name.Builtin
+'string->symbol' Name.Builtin
+' '           Text
 '('           Punctuation
-'apply '      Name.Builtin
-'string'      Name.Variable
+'apply'       Name.Builtin
+' '           Text
+'string'      Name.Builtin
 ' '           Text
 'args'        Name.Variable
 ')'           Punctuation
@@ -2304,9 +2491,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'list-index'  Name.Function
+'list-index'  Name.Builtin
 ' '           Text
 'l'           Name.Variable
 ' '           Text
@@ -2314,7 +2502,8 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 'loop'        Name.Variable
 ' '           Text
 '('           Punctuation
@@ -2332,21 +2521,27 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 'l'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t '       Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'l'           Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -2359,14 +2554,16 @@
 'loop'        Name.Function
 ' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 'n'           Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'l'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -2377,9 +2574,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'make-list'   Name.Function
+'make-list'   Name.Builtin
 ' '           Text
 'n'           Name.Variable
 ' '           Text
@@ -2389,25 +2587,30 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'pair? '      Name.Builtin
+'pair?'       Name.Builtin
+' '           Text
 'init'        Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'set! '       Keyword
+'set!'        Keyword
+' '           Text
 'init'        Name.Variable
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'init'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 'loop'        Name.Variable
 ' '           Text
 '('           Punctuation
@@ -2427,9 +2630,11 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'<= '         Name.Builtin
+'<='          Name.Builtin
+' '           Text
 'n'           Name.Variable
 ' '           Text
 '0'           Literal.Number.Integer
@@ -2441,14 +2646,16 @@
 'loop'        Name.Function
 ' '           Text
 '('           Punctuation
-'cons '       Name.Builtin
+'cons'        Name.Builtin
+' '           Text
 'init'        Name.Variable
 ' '           Text
 'answer'      Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'- '          Name.Builtin
+'-'           Name.Builtin
+' '           Text
 'n'           Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
@@ -2493,9 +2700,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'and-map'     Name.Function
+'and-map'     Name.Builtin
 ' '           Text
 'f'           Name.Variable
 ' '           Text
@@ -2503,7 +2711,8 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 'loop'        Name.Variable
 ' '           Text
 '('           Punctuation
@@ -2521,15 +2730,19 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 'result'      Name.Variable
 '\n\t '       Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 'l'           Name.Variable
 ')'           Punctuation
 '\n\t\t  '    Text
@@ -2543,13 +2756,15 @@
 'f'           Name.Function
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'l'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'l'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -2575,9 +2790,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'or-map'      Name.Function
+'or-map'      Name.Builtin
 ' '           Text
 'f'           Name.Variable
 ' '           Text
@@ -2585,7 +2801,8 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 'loop'        Name.Variable
 ' '           Text
 '('           Punctuation
@@ -2603,15 +2820,19 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 'result'      Name.Variable
 '\n\t'        Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 'l'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -2623,13 +2844,15 @@
 'f'           Name.Function
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'l'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'l'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -2640,15 +2863,16 @@
 '\n\n\x0c\n\n' Text
 
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'provided?'   Name.Function
+'provided?'   Name.Builtin
 ' '           Text
 "'posix"      Literal.String.Symbol
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'primitive-load-path' Name.Function
+'primitive-load-path' Name.Builtin
 ' '           Text
 '"'           Literal.String
 'ice-9/posix.scm' Literal.String
@@ -2658,15 +2882,16 @@
 '\n\n'        Text
 
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'provided?'   Name.Function
+'provided?'   Name.Builtin
 ' '           Text
 "'socket"     Literal.String.Symbol
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'primitive-load-path' Name.Function
+'primitive-load-path' Name.Builtin
 ' '           Text
 '"'           Literal.String
 'ice-9/networking.scm' Literal.String
@@ -2676,31 +2901,34 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
-'file-exists?' Name.Variable
+'define'      Keyword
+' '           Text
+'file-exists?' Name.Builtin
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'provided?'   Name.Function
+'provided?'   Name.Builtin
 ' '           Text
 "'posix"      Literal.String.Symbol
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'str'         Name.Function
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'->bool'      Name.Function
+'->bool'      Name.Builtin
 ' '           Text
 '('           Punctuation
-'false-if-exception' Name.Function
+'false-if-exception' Keyword
 ' '           Text
 '('           Punctuation
-'stat'        Name.Function
+'stat'        Name.Builtin
 ' '           Text
 'str'         Name.Variable
 ')'           Punctuation
@@ -2709,29 +2937,32 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'str'         Name.Function
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'port'        Name.Function
 ' '           Text
 '('           Punctuation
-'catch'       Name.Function
+'catch'       Name.Builtin
 ' '           Text
 "'system-error" Literal.String.Symbol
 ' '           Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'open-file'   Name.Function
+'open-file'   Name.Builtin
 ' '           Text
 'str'         Name.Variable
 ' '           Text
@@ -2740,7 +2971,8 @@
 ')'           Punctuation
 '\n\t\t\t   ' Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 'args'        Name.Variable
 ' '           Text
 '#f'          Name.Constant
@@ -2750,13 +2982,15 @@
 ')'           Punctuation
 '\n\t  '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 'port'        Name.Variable
 ' '           Text
 '('           Punctuation
-'begin '      Keyword
+'begin'       Keyword
+' '           Text
 '('           Punctuation
-'close-port'  Name.Function
+'close-port'  Name.Builtin
 ' '           Text
 'port'        Name.Variable
 ')'           Punctuation
@@ -2773,30 +3007,34 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
-'file-is-directory?' Name.Variable
+'define'      Keyword
+' '           Text
+'file-is-directory?' Name.Builtin
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'provided?'   Name.Function
+'provided?'   Name.Builtin
 ' '           Text
 "'posix"      Literal.String.Symbol
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'str'         Name.Function
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 '('           Punctuation
-'stat:type'   Name.Function
+'stat:type'   Name.Builtin
 ' '           Text
 '('           Punctuation
-'stat'        Name.Function
+'stat'        Name.Builtin
 ' '           Text
 'str'         Name.Variable
 ')'           Punctuation
@@ -2807,32 +3045,36 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'str'         Name.Function
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'port'        Name.Function
 ' '           Text
 '('           Punctuation
-'catch'       Name.Function
+'catch'       Name.Builtin
 ' '           Text
 "'system-error" Literal.String.Symbol
 '\n\t\t\t   ' Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'open-file'   Name.Function
+'open-file'   Name.Builtin
 ' '           Text
 '('           Punctuation
-'string-append ' Name.Builtin
+'string-append' Name.Builtin
+' '           Text
 'str'         Name.Variable
 ' '           Text
 '"'           Literal.String
@@ -2845,7 +3087,8 @@
 ')'           Punctuation
 '\n\t\t\t   ' Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 'args'        Name.Variable
 ' '           Text
 '#f'          Name.Constant
@@ -2855,13 +3098,15 @@
 ')'           Punctuation
 '\n\t  '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 'port'        Name.Variable
 ' '           Text
 '('           Punctuation
-'begin '      Keyword
+'begin'       Keyword
+' '           Text
 '('           Punctuation
-'close-port'  Name.Function
+'close-port'  Name.Builtin
 ' '           Text
 'port'        Name.Variable
 ')'           Punctuation
@@ -2878,7 +3123,8 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'has-suffix?' Name.Function
 ' '           Text
@@ -2888,13 +3134,15 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'sufl'        Name.Function
 ' '           Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 'suffix'      Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -2903,29 +3151,35 @@
 'sl'          Name.Function
 ' '           Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 'str'         Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'> '          Name.Builtin
+'>'           Name.Builtin
+' '           Text
 'sl'          Name.Variable
 ' '           Text
 'sufl'        Name.Variable
 ')'           Punctuation
 '\n\t '       Text
 '('           Punctuation
-'string=? '   Name.Builtin
+'string=?'    Name.Builtin
+' '           Text
 '('           Punctuation
-'substring '  Name.Builtin
+'substring'   Name.Builtin
+' '           Text
 'str'         Name.Variable
 ' '           Text
 '('           Punctuation
-'- '          Name.Builtin
+'-'           Name.Builtin
+' '           Text
 'sl'          Name.Variable
 ' '           Text
 'sufl'        Name.Variable
@@ -2942,19 +3196,23 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'system-error-errno' Name.Function
+'system-error-errno' Name.Builtin
 ' '           Text
 'args'        Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'args'        Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -2962,9 +3220,11 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 '('           Punctuation
-'list-ref '   Name.Builtin
+'list-ref'    Name.Builtin
+' '           Text
 'args'        Name.Variable
 ' '           Text
 '4'           Literal.Number.Integer
@@ -2983,9 +3243,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 ' '           Text
 '.'           Operator
 ' '           Text
@@ -2997,14 +3258,16 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 'args'        Name.Variable
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'scm-error'   Name.Function
+'scm-error'   Name.Builtin
 ' '           Text
 "'misc-error" Literal.String.Symbol
 ' '           Text
@@ -3020,7 +3283,8 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 'loop'        Name.Variable
 ' '           Text
 '('           Punctuation
@@ -3036,18 +3300,22 @@
 'rest'        Name.Function
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'args'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 'rest'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -3056,7 +3324,8 @@
 'loop'        Name.Function
 ' '           Text
 '('           Punctuation
-'string-append ' Name.Builtin
+'string-append' Name.Builtin
+' '           Text
 'msg'         Name.Variable
 ' '           Text
 '"'           Literal.String
@@ -3065,13 +3334,14 @@
 ')'           Punctuation
 '\n\t\t  '    Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'rest'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t    '    Text
 '('           Punctuation
-'scm-error'   Name.Function
+'scm-error'   Name.Builtin
 ' '           Text
 "'misc-error" Literal.String.Symbol
 ' '           Text
@@ -3108,7 +3378,8 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'bad-throw'   Name.Function
 ' '           Text
@@ -3120,13 +3391,14 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'default'     Name.Function
 ' '           Text
 '('           Punctuation
-'symbol-property' Name.Function
+'symbol-property' Name.Builtin
 ' '           Text
 'key'         Name.Variable
 ' '           Text
@@ -3136,13 +3408,16 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 'default'     Name.Variable
 ' '           Text
 '('           Punctuation
-'apply '      Name.Builtin
+'apply'       Name.Builtin
+' '           Text
 'default'     Name.Variable
 ' '           Text
 'key'         Name.Variable
@@ -3152,8 +3427,9 @@
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'apply '      Name.Builtin
-'error'       Name.Variable
+'apply'       Name.Builtin
+' '           Text
+'error'       Name.Builtin
 ' '           Text
 '"'           Literal.String
 'unhandled-exception:' Literal.String
@@ -3169,15 +3445,17 @@
 '\n\n\x0c\n\n' Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tm:sec'      Name.Function
+'tm:sec'      Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '0'           Literal.Number.Integer
@@ -3186,15 +3464,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tm:min'      Name.Function
+'tm:min'      Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
@@ -3203,15 +3483,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tm:hour'     Name.Function
+'tm:hour'     Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '2'           Literal.Number.Integer
@@ -3220,15 +3502,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tm:mday'     Name.Function
+'tm:mday'     Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '3'           Literal.Number.Integer
@@ -3237,15 +3521,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tm:mon'      Name.Function
+'tm:mon'      Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '4'           Literal.Number.Integer
@@ -3254,15 +3540,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tm:year'     Name.Function
+'tm:year'     Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '5'           Literal.Number.Integer
@@ -3271,15 +3559,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tm:wday'     Name.Function
+'tm:wday'     Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '6'           Literal.Number.Integer
@@ -3288,15 +3578,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tm:yday'     Name.Function
+'tm:yday'     Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '7'           Literal.Number.Integer
@@ -3305,15 +3597,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tm:isdst'    Name.Function
+'tm:isdst'    Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '8'           Literal.Number.Integer
@@ -3322,15 +3616,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tm:gmtoff'   Name.Function
+'tm:gmtoff'   Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '9'           Literal.Number.Integer
@@ -3339,15 +3635,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tm:zone'     Name.Function
+'tm:zone'     Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '10'          Literal.Number.Integer
@@ -3356,9 +3654,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'set-tm:sec'  Name.Function
+'set-tm:sec'  Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ' '           Text
@@ -3366,7 +3665,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-set! ' Name.Builtin
+'vector-set!' Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '0'           Literal.Number.Integer
@@ -3377,9 +3677,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'set-tm:min'  Name.Function
+'set-tm:min'  Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ' '           Text
@@ -3387,7 +3688,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-set! ' Name.Builtin
+'vector-set!' Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
@@ -3398,9 +3700,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'set-tm:hour' Name.Function
+'set-tm:hour' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ' '           Text
@@ -3408,7 +3711,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-set! ' Name.Builtin
+'vector-set!' Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '2'           Literal.Number.Integer
@@ -3419,9 +3723,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'set-tm:mday' Name.Function
+'set-tm:mday' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ' '           Text
@@ -3429,7 +3734,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-set! ' Name.Builtin
+'vector-set!' Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '3'           Literal.Number.Integer
@@ -3440,9 +3746,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'set-tm:mon'  Name.Function
+'set-tm:mon'  Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ' '           Text
@@ -3450,7 +3757,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-set! ' Name.Builtin
+'vector-set!' Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '4'           Literal.Number.Integer
@@ -3461,9 +3769,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'set-tm:year' Name.Function
+'set-tm:year' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ' '           Text
@@ -3471,7 +3780,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-set! ' Name.Builtin
+'vector-set!' Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '5'           Literal.Number.Integer
@@ -3482,9 +3792,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'set-tm:wday' Name.Function
+'set-tm:wday' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ' '           Text
@@ -3492,7 +3803,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-set! ' Name.Builtin
+'vector-set!' Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '6'           Literal.Number.Integer
@@ -3503,9 +3815,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'set-tm:yday' Name.Function
+'set-tm:yday' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ' '           Text
@@ -3513,7 +3826,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-set! ' Name.Builtin
+'vector-set!' Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '7'           Literal.Number.Integer
@@ -3524,9 +3838,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'set-tm:isdst' Name.Function
+'set-tm:isdst' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ' '           Text
@@ -3534,7 +3849,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-set! ' Name.Builtin
+'vector-set!' Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '8'           Literal.Number.Integer
@@ -3545,9 +3861,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'set-tm:gmtoff' Name.Function
+'set-tm:gmtoff' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ' '           Text
@@ -3555,7 +3872,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-set! ' Name.Builtin
+'vector-set!' Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '9'           Literal.Number.Integer
@@ -3566,9 +3884,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'set-tm:zone' Name.Function
+'set-tm:zone' Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ' '           Text
@@ -3576,7 +3895,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-set! ' Name.Builtin
+'vector-set!' Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '10'          Literal.Number.Integer
@@ -3587,15 +3907,17 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tms:clock'   Name.Function
+'tms:clock'   Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '0'           Literal.Number.Integer
@@ -3604,15 +3926,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tms:utime'   Name.Function
+'tms:utime'   Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
@@ -3621,15 +3945,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tms:stime'   Name.Function
+'tms:stime'   Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '2'           Literal.Number.Integer
@@ -3638,15 +3964,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tms:cutime'  Name.Function
+'tms:cutime'  Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '3'           Literal.Number.Integer
@@ -3655,15 +3983,17 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tms:cstime'  Name.Function
+'tms:cstime'  Name.Builtin
 ' '           Text
 'obj'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obj'         Name.Variable
 ' '           Text
 '4'           Literal.Number.Integer
@@ -3672,17 +4002,19 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
-'file-position' Name.Variable
+'define'      Keyword
+' '           Text
+'file-position' Name.Builtin
 ' '           Text
-'ftell'       Name.Variable
+'ftell'       Name.Builtin
 ')'           Punctuation
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'file-set-position' Name.Function
+'file-set-position' Name.Builtin
 ' '           Text
 'port'        Name.Variable
 ' '           Text
@@ -3694,15 +4026,18 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'whence'      Name.Function
 ' '           Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 'whence'      Name.Variable
 ' '           Text
 "'"           Operator
@@ -3713,7 +4048,8 @@
 'SEEK_SET'    Name.Variable
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'whence'      Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -3721,7 +4057,7 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'seek'        Name.Function
+'seek'        Name.Builtin
 ' '           Text
 'port'        Name.Variable
 ' '           Text
@@ -3734,9 +4070,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'move->fdes'  Name.Function
+'move->fdes'  Name.Builtin
 ' '           Text
 'fd/port'     Name.Variable
 ' '           Text
@@ -3744,15 +4081,17 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'cond '       Keyword
+'cond'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
-'integer? '   Name.Builtin
+'integer?'    Name.Builtin
+' '           Text
 'fd/port'     Name.Variable
 ')'           Punctuation
 '\n\t '       Text
 '('           Punctuation
-'dup->fdes'   Name.Function
+'dup->fdes'   Name.Builtin
 ' '           Text
 'fd/port'     Name.Variable
 ' '           Text
@@ -3760,7 +4099,7 @@
 ')'           Punctuation
 '\n\t '       Text
 '('           Punctuation
-'close'       Name.Function
+'close'       Name.Builtin
 ' '           Text
 'fd/port'     Name.Variable
 ')'           Punctuation
@@ -3769,10 +4108,10 @@
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'else'        Name.Function
+'else'        Keyword
 '\n\t '       Text
 '('           Punctuation
-'primitive-move->fdes' Name.Function
+'primitive-move->fdes' Name.Builtin
 ' '           Text
 'fd/port'     Name.Variable
 ' '           Text
@@ -3780,7 +4119,7 @@
 ')'           Punctuation
 '\n\t '       Text
 '('           Punctuation
-'set-port-revealed!' Name.Function
+'set-port-revealed!' Name.Builtin
 ' '           Text
 'fd/port'     Name.Variable
 ' '           Text
@@ -3794,21 +4133,23 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'release-port-handle' Name.Function
+'release-port-handle' Name.Builtin
 ' '           Text
 'port'        Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'revealed'    Name.Function
 ' '           Text
 '('           Punctuation
-'port-revealed' Name.Function
+'port-revealed' Name.Builtin
 ' '           Text
 'port'        Name.Variable
 ')'           Punctuation
@@ -3816,21 +4157,24 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'> '          Name.Builtin
+'>'           Name.Builtin
+' '           Text
 'revealed'    Name.Variable
 ' '           Text
 '0'           Literal.Number.Integer
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'set-port-revealed!' Name.Function
+'set-port-revealed!' Name.Builtin
 ' '           Text
 'port'        Name.Variable
 ' '           Text
 '('           Punctuation
-'- '          Name.Builtin
+'-'           Name.Builtin
+' '           Text
 'revealed'    Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
@@ -3842,9 +4186,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'dup->port'   Name.Function
+'dup->port'   Name.Builtin
 ' '           Text
 'port/fd'     Name.Variable
 ' '           Text
@@ -3856,17 +4201,19 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'port'        Name.Function
 ' '           Text
 '('           Punctuation
-'fdopen'      Name.Function
+'fdopen'      Name.Builtin
 ' '           Text
 '('           Punctuation
-'apply '      Name.Builtin
-'dup->fdes'   Name.Variable
+'apply'       Name.Builtin
+' '           Text
+'dup->fdes'   Name.Builtin
 ' '           Text
 'port/fd'     Name.Variable
 ' '           Text
@@ -3879,14 +4226,16 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'pair? '      Name.Builtin
+'pair?'       Name.Builtin
+' '           Text
 'maybe-fd'    Name.Variable
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'set-port-revealed!' Name.Function
+'set-port-revealed!' Name.Builtin
 ' '           Text
 'port'        Name.Variable
 ' '           Text
@@ -3900,9 +4249,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'dup->inport' Name.Function
+'dup->inport' Name.Builtin
 ' '           Text
 'port/fd'     Name.Variable
 ' '           Text
@@ -3912,8 +4262,9 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'apply '      Name.Builtin
-'dup->port'   Name.Variable
+'apply'       Name.Builtin
+' '           Text
+'dup->port'   Name.Builtin
 ' '           Text
 'port/fd'     Name.Variable
 ' '           Text
@@ -3927,9 +4278,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'dup->outport' Name.Function
+'dup->outport' Name.Builtin
 ' '           Text
 'port/fd'     Name.Variable
 ' '           Text
@@ -3939,8 +4291,9 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'apply '      Name.Builtin
-'dup->port'   Name.Variable
+'apply'       Name.Builtin
+' '           Text
+'dup->port'   Name.Builtin
 ' '           Text
 'port/fd'     Name.Variable
 ' '           Text
@@ -3954,9 +4307,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'dup'         Name.Function
+'dup'         Name.Builtin
 ' '           Text
 'port/fd'     Name.Variable
 ' '           Text
@@ -3966,15 +4320,18 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'integer? '   Name.Builtin
+'integer?'    Name.Builtin
+' '           Text
 'port/fd'     Name.Variable
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'apply '      Name.Builtin
-'dup->fdes'   Name.Variable
+'apply'       Name.Builtin
+' '           Text
+'dup->fdes'   Name.Builtin
 ' '           Text
 'port/fd'     Name.Variable
 ' '           Text
@@ -3982,13 +4339,14 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'apply '      Name.Builtin
-'dup->port'   Name.Variable
+'apply'       Name.Builtin
+' '           Text
+'dup->port'   Name.Builtin
 ' '           Text
 'port/fd'     Name.Variable
 ' '           Text
 '('           Punctuation
-'port-mode'   Name.Function
+'port-mode'   Name.Builtin
 ' '           Text
 'port/fd'     Name.Variable
 ')'           Punctuation
@@ -4000,9 +4358,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'duplicate-port' Name.Function
+'duplicate-port' Name.Builtin
 ' '           Text
 'port'        Name.Variable
 ' '           Text
@@ -4010,7 +4369,7 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'dup->port'   Name.Function
+'dup->port'   Name.Builtin
 ' '           Text
 'port'        Name.Variable
 ' '           Text
@@ -4020,15 +4379,17 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'fdes->inport' Name.Function
+'fdes->inport' Name.Builtin
 ' '           Text
 'fdes'        Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 'loop'        Name.Variable
 ' '           Text
 '('           Punctuation
@@ -4036,7 +4397,7 @@
 'rest-ports'  Name.Function
 ' '           Text
 '('           Punctuation
-'fdes->ports' Name.Function
+'fdes->ports' Name.Builtin
 ' '           Text
 'fdes'        Name.Variable
 ')'           Punctuation
@@ -4044,21 +4405,24 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'cond '       Keyword
+'cond'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 'rest-ports'  Name.Variable
 ')'           Punctuation
 '\n\t   '     Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'result'      Name.Function
 ' '           Text
 '('           Punctuation
-'fdopen'      Name.Function
+'fdopen'      Name.Builtin
 ' '           Text
 'fdes'        Name.Variable
 ' '           Text
@@ -4070,7 +4434,7 @@
 ')'           Punctuation
 '\n\t     '   Text
 '('           Punctuation
-'set-port-revealed!' Name.Function
+'set-port-revealed!' Name.Builtin
 ' '           Text
 'result'      Name.Variable
 ' '           Text
@@ -4083,28 +4447,33 @@
 '\n\t  '      Text
 '('           Punctuation
 '('           Punctuation
-'input-port? ' Name.Builtin
+'input-port?' Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'rest-ports'  Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t   '     Text
 '('           Punctuation
-'set-port-revealed!' Name.Function
+'set-port-revealed!' Name.Builtin
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'rest-ports'  Name.Variable
 ')'           Punctuation
 '\n\t\t\t       ' Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 '('           Punctuation
-'port-revealed' Name.Function
+'port-revealed' Name.Builtin
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'rest-ports'  Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -4114,19 +4483,21 @@
 ')'           Punctuation
 '\n\t   '     Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'rest-ports'  Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t  '      Text
 '('           Punctuation
-'else'        Name.Function
+'else'        Keyword
 '\n\t   '     Text
 '('           Punctuation
 'loop'        Name.Function
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'rest-ports'  Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -4137,15 +4508,17 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'fdes->outport' Name.Function
+'fdes->outport' Name.Builtin
 ' '           Text
 'fdes'        Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 'loop'        Name.Variable
 ' '           Text
 '('           Punctuation
@@ -4153,7 +4526,7 @@
 'rest-ports'  Name.Function
 ' '           Text
 '('           Punctuation
-'fdes->ports' Name.Function
+'fdes->ports' Name.Builtin
 ' '           Text
 'fdes'        Name.Variable
 ')'           Punctuation
@@ -4161,21 +4534,24 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'cond '       Keyword
+'cond'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 'rest-ports'  Name.Variable
 ')'           Punctuation
 '\n\t   '     Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'result'      Name.Function
 ' '           Text
 '('           Punctuation
-'fdopen'      Name.Function
+'fdopen'      Name.Builtin
 ' '           Text
 'fdes'        Name.Variable
 ' '           Text
@@ -4187,7 +4563,7 @@
 ')'           Punctuation
 '\n\t     '   Text
 '('           Punctuation
-'set-port-revealed!' Name.Function
+'set-port-revealed!' Name.Builtin
 ' '           Text
 'result'      Name.Variable
 ' '           Text
@@ -4200,28 +4576,33 @@
 '\n\t  '      Text
 '('           Punctuation
 '('           Punctuation
-'output-port? ' Name.Builtin
+'output-port?' Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'rest-ports'  Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t   '     Text
 '('           Punctuation
-'set-port-revealed!' Name.Function
+'set-port-revealed!' Name.Builtin
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'rest-ports'  Name.Variable
 ')'           Punctuation
 '\n\t\t\t       ' Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 '('           Punctuation
-'port-revealed' Name.Function
+'port-revealed' Name.Builtin
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'rest-ports'  Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -4231,19 +4612,21 @@
 ')'           Punctuation
 '\n\t   '     Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'rest-ports'  Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t  '      Text
 '('           Punctuation
-'else'        Name.Function
+'else'        Keyword
 '\n\t   '     Text
 '('           Punctuation
 'loop'        Name.Function
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'rest-ports'  Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -4254,22 +4637,24 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'port->fdes'  Name.Function
+'port->fdes'  Name.Builtin
 ' '           Text
 'port'        Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'set-port-revealed!' Name.Function
+'set-port-revealed!' Name.Builtin
 ' '           Text
 'port'        Name.Variable
 ' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 '('           Punctuation
-'port-revealed' Name.Function
+'port-revealed' Name.Builtin
 ' '           Text
 'port'        Name.Variable
 ')'           Punctuation
@@ -4279,7 +4664,7 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'fileno'      Name.Function
+'fileno'      Name.Builtin
 ' '           Text
 'port'        Name.Variable
 ')'           Punctuation
@@ -4287,9 +4672,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'setenv'      Name.Function
+'setenv'      Name.Builtin
 ' '           Text
 'name'        Name.Variable
 ' '           Text
@@ -4297,14 +4683,16 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 'value'       Name.Variable
 '\n      '    Text
 '('           Punctuation
-'putenv'      Name.Function
+'putenv'      Name.Builtin
 ' '           Text
 '('           Punctuation
-'string-append ' Name.Builtin
+'string-append' Name.Builtin
+' '           Text
 'name'        Name.Variable
 ' '           Text
 '"'           Literal.String
@@ -4316,7 +4704,7 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'putenv'      Name.Function
+'putenv'      Name.Builtin
 ' '           Text
 'name'        Name.Variable
 ')'           Punctuation
@@ -4337,11 +4725,13 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 'scheme-file-suffix' Name.Variable
 ' '           Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 ')'           Punctuation
 ' '           Text
@@ -4353,9 +4743,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'in-vicinity' Name.Function
+'in-vicinity' Name.Builtin
 ' '           Text
 'vicinity'    Name.Variable
 ' '           Text
@@ -4363,39 +4754,46 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'tail'        Name.Function
 ' '           Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'len'         Name.Function
 ' '           Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 'vicinity'    Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n\t\t'      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'zero? '      Name.Builtin
+'zero?'       Name.Builtin
+' '           Text
 'len'         Name.Variable
 ')'           Punctuation
 '\n\t\t    '  Text
 '#f'          Name.Constant
 '\n\t\t    '  Text
 '('           Punctuation
-'string-ref ' Name.Builtin
+'string-ref'  Name.Builtin
+' '           Text
 'vicinity'    Name.Variable
 ' '           Text
 '('           Punctuation
-'- '          Name.Builtin
+'-'           Name.Builtin
+' '           Text
 'len'         Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
@@ -4407,20 +4805,25 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'string-append ' Name.Builtin
+'string-append' Name.Builtin
+' '           Text
 'vicinity'    Name.Variable
 '\n\t\t   '   Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 'tail'        Name.Variable
 ')'           Punctuation
 '\n\t\t\t   ' Text
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 'tail'        Name.Variable
 ' '           Text
 '#\\/'        Literal.String.Char
@@ -4454,13 +4857,14 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'command-line' Name.Function
+'command-line' Name.Builtin
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'program-arguments' Name.Function
+'program-arguments' Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 '\n\n'        Text
@@ -4472,21 +4876,24 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'load-user-init' Name.Function
+'load-user-init' Name.Builtin
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let* '       Keyword
+'let*'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'home'        Name.Function
 ' '           Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
-'getenv'      Name.Function
+'getenv'      Name.Builtin
 ' '           Text
 '"'           Literal.String
 'HOME'        Literal.String
@@ -4494,16 +4901,16 @@
 ')'           Punctuation
 '\n\t\t   '   Text
 '('           Punctuation
-'false-if-exception' Name.Function
+'false-if-exception' Keyword
 ' '           Text
 '('           Punctuation
-'passwd:dir'  Name.Function
+'passwd:dir'  Name.Builtin
 ' '           Text
 '('           Punctuation
-'getpwuid'    Name.Function
+'getpwuid'    Name.Builtin
 ' '           Text
 '('           Punctuation
-'getuid'      Name.Function
+'getuid'      Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
@@ -4521,7 +4928,7 @@
 'init-file'   Name.Function
 ' '           Text
 '('           Punctuation
-'in-vicinity' Name.Function
+'in-vicinity' Name.Builtin
 ' '           Text
 'home'        Name.Variable
 ' '           Text
@@ -4533,15 +4940,16 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'file-exists?' Name.Function
+'file-exists?' Name.Builtin
 ' '           Text
 'init-file'   Name.Variable
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'primitive-load' Name.Function
+'primitive-load' Name.Builtin
 ' '           Text
 'init-file'   Name.Variable
 ')'           Punctuation
@@ -4563,20 +4971,21 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'load-from-path' Name.Function
+'load-from-path' Name.Builtin
 ' '           Text
 'name'        Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'start-stack' Name.Function
+'start-stack' Keyword
 ' '           Text
 "'load-stack" Literal.String.Symbol
 '\n\t       ' Text
 '('           Punctuation
-'primitive-load-path' Name.Function
+'primitive-load-path' Name.Builtin
 ' '           Text
 'name'        Name.Variable
 ')'           Punctuation
@@ -4603,16 +5012,20 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'exp '        Name.Builtin
+'exp'         Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -4623,18 +5036,21 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'make-polar ' Name.Builtin
+'make-polar'  Name.Builtin
+' '           Text
 '('           Punctuation
 '$exp'        Name.Function
 ' '           Text
 '('           Punctuation
-'real-part '  Name.Builtin
+'real-part'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'imag-part '  Name.Builtin
+'imag-part'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -4643,23 +5059,29 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'log '        Name.Builtin
+'log'         Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'>= '         Name.Builtin
+'>='          Name.Builtin
+' '           Text
 'z'           Name.Variable
 ' '           Text
 '0'           Literal.Number.Integer
@@ -4673,18 +5095,21 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'make-rectangular ' Name.Builtin
+'make-rectangular' Name.Builtin
+' '           Text
 '('           Punctuation
 '$log'        Name.Function
 ' '           Text
 '('           Punctuation
-'magnitude '  Name.Builtin
+'magnitude'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'angle '      Name.Builtin
+'angle'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -4693,35 +5118,43 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'sqrt '       Name.Builtin
+'sqrt'        Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'negative? '  Name.Builtin
+'negative?'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'make-rectangular ' Name.Builtin
+'make-rectangular' Name.Builtin
+' '           Text
 '0'           Literal.Number.Integer
 ' '           Text
 '('           Punctuation
 '$sqrt'       Name.Function
 ' '           Text
 '('           Punctuation
-'- '          Name.Builtin
+'-'           Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -4735,20 +5168,24 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'make-polar ' Name.Builtin
+'make-polar'  Name.Builtin
+' '           Text
 '('           Punctuation
 '$sqrt'       Name.Function
 ' '           Text
 '('           Punctuation
-'magnitude '  Name.Builtin
+'magnitude'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'/ '          Name.Builtin
+'/'           Name.Builtin
+' '           Text
 '('           Punctuation
-'angle '      Name.Builtin
+'angle'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -4760,21 +5197,24 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
-'expt'        Name.Variable
+'define'      Keyword
+' '           Text
+'expt'        Name.Builtin
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
-'integer-expt' Name.Function
+'integer-expt' Name.Builtin
 ' '           Text
-'integer-expt' Name.Variable
+'integer-expt' Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'z1'          Name.Function
 ' '           Text
@@ -4782,38 +5222,44 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'cond '       Keyword
+'cond'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
-'integer? '   Name.Builtin
+'integer?'    Name.Builtin
+' '           Text
 'z2'          Name.Variable
 ')'           Punctuation
 '\n             ' Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'negative? '  Name.Builtin
+'negative?'   Name.Builtin
+' '           Text
 'z2'          Name.Variable
 ')'           Punctuation
 '\n\t\t '     Text
 '('           Punctuation
-'/ '          Name.Builtin
+'/'           Name.Builtin
+' '           Text
 '1'           Literal.Number.Integer
 ' '           Text
 '('           Punctuation
-'integer-expt' Name.Function
+'integer-expt' Name.Builtin
 ' '           Text
 'z1'          Name.Variable
 ' '           Text
 '('           Punctuation
-'- '          Name.Builtin
+'-'           Name.Builtin
+' '           Text
 'z2'          Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n\t\t '     Text
 '('           Punctuation
-'integer-expt' Name.Function
+'integer-expt' Name.Builtin
 ' '           Text
 'z1'          Name.Variable
 ' '           Text
@@ -4824,19 +5270,23 @@
 '\n\t    '    Text
 '('           Punctuation
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z2'          Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z1'          Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'>= '         Name.Builtin
+'>='          Name.Builtin
+' '           Text
 'z1'          Name.Variable
 ' '           Text
 '0'           Literal.Number.Integer
@@ -4853,16 +5303,19 @@
 ')'           Punctuation
 '\n\t    '    Text
 '('           Punctuation
-'else'        Name.Function
+'else'        Keyword
 '\n\t     '   Text
 '('           Punctuation
-'exp '        Name.Builtin
+'exp'         Name.Builtin
+' '           Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 'z2'          Name.Variable
 ' '           Text
 '('           Punctuation
-'log '        Name.Builtin
+'log'         Name.Builtin
+' '           Text
 'z1'          Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -4875,17 +5328,20 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'sinh'        Name.Function
+'sinh'        Name.Builtin
 ' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -4896,13 +5352,15 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'x'           Name.Function
 ' '           Text
 '('           Punctuation
-'real-part '  Name.Builtin
+'real-part'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -4911,16 +5369,19 @@
 'y'           Name.Function
 ' '           Text
 '('           Punctuation
-'imag-part '  Name.Builtin
+'imag-part'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'make-rectangular ' Name.Builtin
+'make-rectangular' Name.Builtin
+' '           Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '('           Punctuation
 '$sinh'       Name.Function
 ' '           Text
@@ -4935,7 +5396,8 @@
 ')'           Punctuation
 '\n\t\t\t  '  Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '('           Punctuation
 '$cosh'       Name.Function
 ' '           Text
@@ -4955,17 +5417,20 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'cosh'        Name.Function
+'cosh'        Name.Builtin
 ' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -4976,13 +5441,15 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'x'           Name.Function
 ' '           Text
 '('           Punctuation
-'real-part '  Name.Builtin
+'real-part'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -4991,16 +5458,19 @@
 'y'           Name.Function
 ' '           Text
 '('           Punctuation
-'imag-part '  Name.Builtin
+'imag-part'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'make-rectangular ' Name.Builtin
+'make-rectangular' Name.Builtin
+' '           Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '('           Punctuation
 '$cosh'       Name.Function
 ' '           Text
@@ -5015,7 +5485,8 @@
 ')'           Punctuation
 '\n\t\t\t  '  Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '('           Punctuation
 '$sinh'       Name.Function
 ' '           Text
@@ -5035,17 +5506,20 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tanh'        Name.Function
+'tanh'        Name.Builtin
 ' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -5056,17 +5530,20 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'let* '       Keyword
+'let*'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'x'           Name.Function
 ' '           Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '2'           Literal.Number.Integer
 ' '           Text
 '('           Punctuation
-'real-part '  Name.Builtin
+'real-part'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -5076,11 +5553,13 @@
 'y'           Name.Function
 ' '           Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '2'           Literal.Number.Integer
 ' '           Text
 '('           Punctuation
-'imag-part '  Name.Builtin
+'imag-part'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -5090,7 +5569,8 @@
 'w'           Name.Function
 ' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 '('           Punctuation
 '$cosh'       Name.Function
 ' '           Text
@@ -5107,9 +5587,11 @@
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'make-rectangular ' Name.Builtin
+'make-rectangular' Name.Builtin
+' '           Text
 '('           Punctuation
-'/ '          Name.Builtin
+'/'           Name.Builtin
+' '           Text
 '('           Punctuation
 '$sinh'       Name.Function
 ' '           Text
@@ -5120,7 +5602,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'/ '          Name.Builtin
+'/'           Name.Builtin
+' '           Text
 '('           Punctuation
 '$sin'        Name.Function
 ' '           Text
@@ -5136,17 +5619,20 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'asinh'       Name.Function
+'asinh'       Name.Builtin
 ' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -5157,17 +5643,22 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'log '        Name.Builtin
+'log'         Name.Builtin
+' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 'z'           Name.Variable
 ' '           Text
 '('           Punctuation
-'sqrt '       Name.Builtin
+'sqrt'        Name.Builtin
+' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 'z'           Name.Variable
 ' '           Text
 'z'           Name.Variable
@@ -5183,24 +5674,29 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'acosh'       Name.Function
+'acosh'       Name.Builtin
 ' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'>= '         Name.Builtin
+'>='          Name.Builtin
+' '           Text
 'z'           Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
@@ -5214,17 +5710,22 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'log '        Name.Builtin
+'log'         Name.Builtin
+' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 'z'           Name.Variable
 ' '           Text
 '('           Punctuation
-'sqrt '       Name.Builtin
+'sqrt'        Name.Builtin
+' '           Text
 '('           Punctuation
-'- '          Name.Builtin
+'-'           Name.Builtin
+' '           Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 'z'           Name.Variable
 ' '           Text
 'z'           Name.Variable
@@ -5240,31 +5741,37 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'atanh'       Name.Function
+'atanh'       Name.Builtin
 ' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'> '          Name.Builtin
+'>'           Name.Builtin
+' '           Text
 'z'           Name.Variable
 ' '           Text
 '-1'          Literal.Number.Integer
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'< '          Name.Builtin
+'<'           Name.Builtin
+' '           Text
 'z'           Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
@@ -5278,20 +5785,25 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'/ '          Name.Builtin
+'/'           Name.Builtin
+' '           Text
 '('           Punctuation
-'log '        Name.Builtin
+'log'         Name.Builtin
+' '           Text
 '('           Punctuation
-'/ '          Name.Builtin
+'/'           Name.Builtin
+' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 '1'           Literal.Number.Integer
 ' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'- '          Name.Builtin
+'-'           Name.Builtin
+' '           Text
 '1'           Literal.Number.Integer
 ' '           Text
 'z'           Name.Variable
@@ -5306,16 +5818,20 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'sin '        Name.Builtin
+'sin'         Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -5326,13 +5842,15 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'x'           Name.Function
 ' '           Text
 '('           Punctuation
-'real-part '  Name.Builtin
+'real-part'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -5341,16 +5859,19 @@
 'y'           Name.Function
 ' '           Text
 '('           Punctuation
-'imag-part '  Name.Builtin
+'imag-part'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'make-rectangular ' Name.Builtin
+'make-rectangular' Name.Builtin
+' '           Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '('           Punctuation
 '$sin'        Name.Function
 ' '           Text
@@ -5365,7 +5886,8 @@
 ')'           Punctuation
 '\n\t\t\t  '  Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '('           Punctuation
 '$cos'        Name.Function
 ' '           Text
@@ -5385,16 +5907,20 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'cos '        Name.Builtin
+'cos'         Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -5405,13 +5931,15 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'x'           Name.Function
 ' '           Text
 '('           Punctuation
-'real-part '  Name.Builtin
+'real-part'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -5420,16 +5948,19 @@
 'y'           Name.Function
 ' '           Text
 '('           Punctuation
-'imag-part '  Name.Builtin
+'imag-part'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'make-rectangular ' Name.Builtin
+'make-rectangular' Name.Builtin
+' '           Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '('           Punctuation
 '$cos'        Name.Function
 ' '           Text
@@ -5444,9 +5975,11 @@
 ')'           Punctuation
 '\n\t\t\t  '  Text
 '('           Punctuation
-'- '          Name.Builtin
+'-'           Name.Builtin
+' '           Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '('           Punctuation
 '$sin'        Name.Function
 ' '           Text
@@ -5467,16 +6000,20 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'tan '        Name.Builtin
+'tan'         Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -5487,17 +6024,20 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'let* '       Keyword
+'let*'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'x'           Name.Function
 ' '           Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '2'           Literal.Number.Integer
 ' '           Text
 '('           Punctuation
-'real-part '  Name.Builtin
+'real-part'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -5507,11 +6047,13 @@
 'y'           Name.Function
 ' '           Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '2'           Literal.Number.Integer
 ' '           Text
 '('           Punctuation
-'imag-part '  Name.Builtin
+'imag-part'   Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -5521,7 +6063,8 @@
 'w'           Name.Function
 ' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 '('           Punctuation
 '$cos'        Name.Function
 ' '           Text
@@ -5538,9 +6081,11 @@
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'make-rectangular ' Name.Builtin
+'make-rectangular' Name.Builtin
+' '           Text
 '('           Punctuation
-'/ '          Name.Builtin
+'/'           Name.Builtin
+' '           Text
 '('           Punctuation
 '$sin'        Name.Function
 ' '           Text
@@ -5551,7 +6096,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'/ '          Name.Builtin
+'/'           Name.Builtin
+' '           Text
 '('           Punctuation
 '$sinh'       Name.Function
 ' '           Text
@@ -5567,30 +6113,37 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'asin '       Name.Builtin
+'asin'        Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'>= '         Name.Builtin
+'>='          Name.Builtin
+' '           Text
 'z'           Name.Variable
 ' '           Text
 '-1'          Literal.Number.Integer
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'<= '         Name.Builtin
+'<='          Name.Builtin
+' '           Text
 'z'           Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
@@ -5604,14 +6157,16 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '-i'          Literal.Number.Integer
 ' '           Text
 '('           Punctuation
-'asinh'       Name.Function
+'asinh'       Name.Builtin
 ' '           Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '+i'          Literal.Number.Integer
 ' '           Text
 'z'           Name.Variable
@@ -5623,30 +6178,37 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'acos '       Name.Builtin
+'acos'        Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'>= '         Name.Builtin
+'>='          Name.Builtin
+' '           Text
 'z'           Name.Variable
 ' '           Text
 '-1'          Literal.Number.Integer
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'<= '         Name.Builtin
+'<='          Name.Builtin
+' '           Text
 'z'           Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
@@ -5660,11 +6222,14 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 '('           Punctuation
-'/ '          Name.Builtin
+'/'           Name.Builtin
+' '           Text
 '('           Punctuation
-'angle '      Name.Builtin
+'angle'       Name.Builtin
+' '           Text
 '-1'          Literal.Number.Integer
 ')'           Punctuation
 ' '           Text
@@ -5672,14 +6237,16 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '+i'          Literal.Number.Integer
 ' '           Text
 '('           Punctuation
-'asinh'       Name.Function
+'asinh'       Name.Builtin
 ' '           Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 '+i'          Literal.Number.Integer
 ' '           Text
 'z'           Name.Variable
@@ -5692,9 +6259,11 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'atan '       Name.Builtin
+'atan'        Name.Builtin
+' '           Text
 'z'           Name.Variable
 ' '           Text
 '.'           Operator
@@ -5703,16 +6272,20 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 'y'           Name.Variable
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'real? '      Name.Builtin
+'real?'       Name.Builtin
+' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -5723,20 +6296,25 @@
 ')'           Punctuation
 '\n\t  '      Text
 '('           Punctuation
-'/ '          Name.Builtin
+'/'           Name.Builtin
+' '           Text
 '('           Punctuation
-'log '        Name.Builtin
+'log'         Name.Builtin
+' '           Text
 '('           Punctuation
-'/ '          Name.Builtin
+'/'           Name.Builtin
+' '           Text
 '('           Punctuation
-'- '          Name.Builtin
+'-'           Name.Builtin
+' '           Text
 '+i'          Literal.Number.Integer
 ' '           Text
 'z'           Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 '+i'          Literal.Number.Integer
 ' '           Text
 'z'           Name.Variable
@@ -5754,7 +6332,8 @@
 'z'           Name.Variable
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'y'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -5763,22 +6342,26 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'log10'       Name.Function
+'log10'       Name.Builtin
 ' '           Text
 'arg'         Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'/ '          Name.Builtin
+'/'           Name.Builtin
+' '           Text
 '('           Punctuation
-'log '        Name.Builtin
+'log'         Name.Builtin
+' '           Text
 'arg'         Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'log '        Name.Builtin
+'log'         Name.Builtin
+' '           Text
 '10'          Literal.Number.Integer
 ')'           Punctuation
 ')'           Punctuation
@@ -5798,12 +6381,13 @@
 '\n\n'        Text
 
 '('           Punctuation
-'read-hash-extend' Name.Function
+'read-hash-extend' Name.Builtin
 ' '           Text
 "#\\'"        Literal.String.Char
 ' '           Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'c'           Name.Function
 ' '           Text
@@ -5811,7 +6395,8 @@
 ')'           Punctuation
 '\n\t\t\t'    Text
 '('           Punctuation
-'read '       Name.Builtin
+'read'        Name.Builtin
+' '           Text
 'port'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -5819,17 +6404,18 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 'read-eval?'  Name.Variable
 ' '           Text
 '('           Punctuation
-'make-fluid'  Name.Function
+'make-fluid'  Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 '\n'          Text
 
 '('           Punctuation
-'fluid-set!'  Name.Function
+'fluid-set!'  Name.Builtin
 ' '           Text
 'read-eval?'  Name.Variable
 ' '           Text
@@ -5838,12 +6424,13 @@
 '\n'          Text
 
 '('           Punctuation
-'read-hash-extend' Name.Function
+'read-hash-extend' Name.Builtin
 ' '           Text
 '#\\.'        Literal.String.Char
 '\n                  ' Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'c'           Name.Function
 ' '           Text
@@ -5851,27 +6438,30 @@
 ')'           Punctuation
 '\n                    ' Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'fluid-ref'   Name.Function
+'fluid-ref'   Name.Builtin
 ' '           Text
 'read-eval?'  Name.Variable
 ')'           Punctuation
 '\n                        ' Text
 '('           Punctuation
-'eval '       Name.Builtin
+'eval'        Name.Builtin
+' '           Text
 '('           Punctuation
-'read '       Name.Builtin
+'read'        Name.Builtin
+' '           Text
 'port'        Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'interaction-environment' Name.Function
+'interaction-environment' Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 '\n                        ' Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 '\n                         ' Text
 '"'           Literal.String
 '#. read expansion found and read-eval? is #f.' Literal.String
@@ -5889,7 +6479,8 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'get-option'  Name.Function
 ' '           Text
@@ -5903,11 +6494,12 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'cond'        Name.Function
+'cond'        Keyword
 '\n   '       Text
 '('           Punctuation
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 '\n    '      Text
@@ -5924,17 +6516,22 @@
 '\n\n   '     Text
 '('           Punctuation
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 '#\\-'        Literal.String.Char
 ' '           Text
 '('           Punctuation
-'string-ref ' Name.Builtin
+'string-ref'  Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -5944,11 +6541,14 @@
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -5963,12 +6563,14 @@
 "'normal-arg" Literal.String.Symbol
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -5976,13 +6578,16 @@
 '\n\n   '     Text
 '('           Punctuation
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 '#\\-'        Literal.String.Char
 ' '           Text
 '('           Punctuation
-'string-ref ' Name.Builtin
+'string-ref'  Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -5991,18 +6596,21 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'let* '       Keyword
+'let*'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'kw-arg-pos'  Name.Function
 ' '           Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
-'string-index' Name.Function
+'string-index' Name.Builtin
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -6010,9 +6618,11 @@
 ')'           Punctuation
 '\n\t\t\t   ' Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6023,12 +6633,14 @@
 'kw'          Name.Function
 ' '           Text
 '('           Punctuation
-'symbol->keyword' Name.Function
+'symbol->keyword' Name.Builtin
 ' '           Text
 '('           Punctuation
-'substring '  Name.Builtin
+'substring'   Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -6043,7 +6655,8 @@
 'kw-opt?'     Name.Function
 ' '           Text
 '('           Punctuation
-'member '     Name.Builtin
+'member'      Name.Builtin
+' '           Text
 'kw'          Name.Variable
 ' '           Text
 'kw-opts'     Name.Variable
@@ -6054,7 +6667,8 @@
 'kw-arg?'     Name.Function
 ' '           Text
 '('           Punctuation
-'member '     Name.Builtin
+'member'      Name.Builtin
+' '           Text
 'kw'          Name.Variable
 ' '           Text
 'kw-args'     Name.Variable
@@ -6065,19 +6679,25 @@
 'arg'         Name.Function
 ' '           Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 'kw-arg-pos'  Name.Variable
 ' '           Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6085,23 +6705,28 @@
 ')'           Punctuation
 '\n\t\t\t '   Text
 '('           Punctuation
-'substring '  Name.Builtin
+'substring'   Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 '\n\t\t\t\t    ' Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 'kw-arg-pos'  Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
 ')'           Punctuation
 '\n\t\t\t\t    ' Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6109,23 +6734,28 @@
 ')'           Punctuation
 '\n\t\t    '  Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 'kw-arg?'     Name.Variable
 '\n\t\t\t '   Text
 '('           Punctuation
-'begin '      Keyword
+'begin'       Keyword
+' '           Text
 '('           Punctuation
-'set! '       Keyword
+'set!'        Keyword
+' '           Text
 'argv'        Name.Variable
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6135,9 +6765,11 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 'kw-opt?'     Name.Variable
 ' '           Text
 'kw-arg?'     Name.Variable
@@ -6151,7 +6783,8 @@
 'arg'         Name.Variable
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6164,7 +6797,8 @@
 'kw'          Name.Variable
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6173,18 +6807,21 @@
 ')'           Punctuation
 '\n\n   '     Text
 '('           Punctuation
-'else'        Name.Function
+'else'        Keyword
 '\n    '      Text
 '('           Punctuation
-'let* '       Keyword
+'let*'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'char'        Name.Function
 ' '           Text
 '('           Punctuation
-'substring '  Name.Builtin
+'substring'   Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -6198,7 +6835,7 @@
 'kw'          Name.Function
 ' '           Text
 '('           Punctuation
-'symbol->keyword' Name.Function
+'symbol->keyword' Name.Builtin
 ' '           Text
 'char'        Name.Variable
 ')'           Punctuation
@@ -6206,35 +6843,41 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'cond'        Name.Function
+'cond'        Keyword
 '\n\n       ' Text
 '('           Punctuation
 '('           Punctuation
-'member '     Name.Builtin
+'member'      Name.Builtin
+' '           Text
 'kw'          Name.Variable
 ' '           Text
 'kw-opts'     Name.Variable
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'let* '       Keyword
+'let*'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'rest-car'    Name.Function
 ' '           Text
 '('           Punctuation
-'substring '  Name.Builtin
+'substring'   Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ' '           Text
 '2'           Literal.Number.Integer
 ' '           Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6245,26 +6888,32 @@
 'new-argv'    Name.Function
 ' '           Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'= '          Name.Builtin
+'='           Name.Builtin
+' '           Text
 '0'           Literal.Number.Integer
 ' '           Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 'rest-car'    Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t\t\t     ' Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 '\n\t\t\t     ' Text
 '('           Punctuation
-'cons '       Name.Builtin
+'cons'        Name.Builtin
+' '           Text
 '('           Punctuation
-'string-append ' Name.Builtin
+'string-append' Name.Builtin
+' '           Text
 '"'           Literal.String
 '-'           Literal.String
 '"'           Literal.String
@@ -6273,7 +6922,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6295,31 +6945,37 @@
 '\n\n       ' Text
 '('           Punctuation
 '('           Punctuation
-'member '     Name.Builtin
+'member'      Name.Builtin
+' '           Text
 'kw'          Name.Variable
 ' '           Text
 'kw-args'     Name.Variable
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'let* '       Keyword
+'let*'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'rest-car'    Name.Function
 ' '           Text
 '('           Punctuation
-'substring '  Name.Builtin
+'substring'   Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ' '           Text
 '2'           Literal.Number.Integer
 ' '           Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6330,19 +6986,23 @@
 'arg'         Name.Function
 ' '           Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'= '          Name.Builtin
+'='           Name.Builtin
+' '           Text
 '0'           Literal.Number.Integer
 ' '           Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 'rest-car'    Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t\t\t'    Text
 '('           Punctuation
-'cadr '       Name.Builtin
+'cadr'        Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 '\n\t\t\t'    Text
@@ -6354,24 +7014,29 @@
 'new-argv'    Name.Function
 ' '           Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'= '          Name.Builtin
+'='           Name.Builtin
+' '           Text
 '0'           Literal.Number.Integer
 ' '           Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 'rest-car'    Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t\t\t     ' Text
 '('           Punctuation
-'cddr '       Name.Builtin
+'cddr'        Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 '\n\t\t\t     ' Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'argv'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6391,7 +7056,8 @@
 ')'           Punctuation
 '\n\n       ' Text
 '('           Punctuation
-'else '       Keyword
+'else'        Keyword
+' '           Text
 '('           Punctuation
 'return'      Name.Function
 ' '           Text
@@ -6410,7 +7076,8 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'for-next-option' Name.Function
 ' '           Text
@@ -6424,7 +7091,8 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 'loop'        Name.Variable
 ' '           Text
 '('           Punctuation
@@ -6445,7 +7113,8 @@
 'kw-args'     Name.Variable
 '\n\t\t'      Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'opt'         Name.Function
 ' '           Text
@@ -6455,7 +7124,8 @@
 ')'           Punctuation
 '\n\t\t  '    Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 'opt'         Name.Variable
 ' '           Text
 '('           Punctuation
@@ -6477,7 +7147,8 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'display-usage-report' Name.Function
 ' '           Text
@@ -6485,20 +7156,24 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'for-each'    Name.Function
+'for-each'    Name.Builtin
 '\n   '       Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'kw'          Name.Function
 ')'           Punctuation
 '\n     '     Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'kw'          Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -6506,9 +7181,11 @@
 ')'           Punctuation
 '\n\t '       Text
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'kw'          Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -6516,7 +7193,8 @@
 ')'           Punctuation
 '\n\t '       Text
 '('           Punctuation
-'let* '       Keyword
+'let*'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'opt-desc'    Name.Function
@@ -6528,7 +7206,8 @@
 'help'        Name.Function
 ' '           Text
 '('           Punctuation
-'cadr '       Name.Builtin
+'cadr'        Name.Builtin
+' '           Text
 'opt-desc'    Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6537,7 +7216,8 @@
 'opts'        Name.Function
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'opt-desc'    Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6546,17 +7226,21 @@
 'opts-proper' Name.Function
 ' '           Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'string? '    Name.Builtin
+'string?'     Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'opts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'opts'        Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -6568,23 +7252,28 @@
 'arg-name'    Name.Function
 ' '           Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'string? '    Name.Builtin
+'string?'     Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'opts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t\t\t      ' Text
 '('           Punctuation
-'string-append ' Name.Builtin
+'string-append' Name.Builtin
+' '           Text
 '"'           Literal.String
 '<'           Literal.String
 '"'           Literal.String
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'opts'        Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -6602,35 +7291,40 @@
 'left-part'   Name.Function
 ' '           Text
 '('           Punctuation
-'string-append' Name.Function
+'string-append' Name.Builtin
 '\n\t\t\t    ' Text
 '('           Punctuation
-'with-output-to-string' Name.Function
+'with-output-to-string' Name.Builtin
 '\n\t\t\t      ' Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 ')'           Punctuation
 '\n\t\t\t\t'  Text
 '('           Punctuation
-'map '        Name.Builtin
+'map'         Name.Builtin
+' '           Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'x'           Name.Function
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '('           Punctuation
-'keyword->symbol' Name.Function
+'keyword->symbol' Name.Builtin
 ' '           Text
 'x'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '"'           Literal.String
 ' '           Literal.String
 '"'           Literal.String
@@ -6650,13 +7344,17 @@
 'middle-part' Name.Function
 ' '           Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'< '          Name.Builtin
+'<'           Name.Builtin
+' '           Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 'left-part'   Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -6664,9 +7362,11 @@
 ')'           Punctuation
 '\n\t\t\t\t      ' Text
 '('           Punctuation
-'< '          Name.Builtin
+'<'           Name.Builtin
+' '           Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 'help'        Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -6675,13 +7375,16 @@
 ')'           Punctuation
 '\n\t\t\t\t ' Text
 '('           Punctuation
-'make-string ' Name.Builtin
+'make-string' Name.Builtin
+' '           Text
 '('           Punctuation
-'- '          Name.Builtin
+'-'           Name.Builtin
+' '           Text
 '30'          Literal.Number.Integer
 ' '           Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 'left-part'   Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6698,22 +7401,25 @@
 ')'           Punctuation
 '\n\t   '     Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 'left-part'   Name.Variable
 ')'           Punctuation
 '\n\t   '     Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 'middle-part' Name.Variable
 ')'           Punctuation
 '\n\t   '     Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 'help'        Name.Variable
 ')'           Punctuation
 '\n\t   '     Text
 '('           Punctuation
-'newline'     Name.Function
+'newline'     Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
@@ -6725,7 +7431,8 @@
 '\n\n\n\n'    Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'transform-usage-lambda' Name.Function
 ' '           Text
@@ -6733,19 +7440,21 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let* '       Keyword
+'let*'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'raw-usage'   Name.Function
 ' '           Text
 '('           Punctuation
-'delq!'       Name.Function
+'delq!'       Name.Builtin
 ' '           Text
 "'else"       Literal.String.Symbol
 ' '           Text
 '('           Punctuation
-'map '        Name.Builtin
-'car'         Name.Variable
+'map'         Name.Builtin
+' '           Text
+'car'         Name.Builtin
 ' '           Text
 'cases'       Name.Variable
 ')'           Punctuation
@@ -6756,21 +7465,27 @@
 'usage-sans-specials' Name.Function
 ' '           Text
 '('           Punctuation
-'map '        Name.Builtin
+'map'         Name.Builtin
+' '           Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'x'           Name.Function
 ')'           Punctuation
 '\n\t\t\t\t    ' Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'list? '      Name.Builtin
+'list?'       Name.Builtin
+' '           Text
 'x'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6779,11 +7494,14 @@
 ')'           Punctuation
 '\n\t\t\t\t\t' Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'symbol? '    Name.Builtin
+'symbol?'     Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'x'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6792,11 +7510,14 @@
 ')'           Punctuation
 '\n\t\t\t\t\t' Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'boolean? '   Name.Builtin
+'boolean?'    Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'x'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6816,7 +7537,7 @@
 'usage-desc'  Name.Function
 ' '           Text
 '('           Punctuation
-'delq!'       Name.Function
+'delq!'       Name.Builtin
 ' '           Text
 '#t'          Name.Constant
 ' '           Text
@@ -6828,8 +7549,9 @@
 'kw-desc'     Name.Function
 ' '           Text
 '('           Punctuation
-'map '        Name.Builtin
-'car'         Name.Variable
+'map'         Name.Builtin
+' '           Text
+'car'         Name.Builtin
 ' '           Text
 'usage-desc'  Name.Variable
 ')'           Punctuation
@@ -6839,25 +7561,32 @@
 'kw-opts'     Name.Function
 ' '           Text
 '('           Punctuation
-'apply '      Name.Builtin
-'append'      Name.Variable
+'apply'       Name.Builtin
+' '           Text
+'append'      Name.Builtin
 ' '           Text
 '('           Punctuation
-'map '        Name.Builtin
+'map'         Name.Builtin
+' '           Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'x'           Name.Function
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'string? '    Name.Builtin
+'string?'     Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'x'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6876,29 +7605,36 @@
 'kw-args'     Name.Function
 ' '           Text
 '('           Punctuation
-'apply '      Name.Builtin
-'append'      Name.Variable
+'apply'       Name.Builtin
+' '           Text
+'append'      Name.Builtin
 ' '           Text
 '('           Punctuation
-'map '        Name.Builtin
+'map'         Name.Builtin
+' '           Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'x'           Name.Function
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'string? '    Name.Builtin
+'string?'     Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'x'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'x'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6913,39 +7649,48 @@
 'transmogrified-cases' Name.Function
 ' '           Text
 '('           Punctuation
-'map '        Name.Builtin
+'map'         Name.Builtin
+' '           Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
-'case'        Name.Function
+'case'        Keyword
 ')'           Punctuation
 '\n\t\t\t\t      ' Text
 '('           Punctuation
-'cons '       Name.Builtin
+'cons'        Name.Builtin
+' '           Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'opts'        Name.Function
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
-'case'        Name.Variable
+'car'         Name.Builtin
+' '           Text
+'case'        Keyword
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n\t\t\t\t\t      ' Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
-'boolean? '   Name.Builtin
+'boolean?'    Name.Builtin
+' '           Text
 'opts'        Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'eq? '        Name.Builtin
+'eq?'         Name.Builtin
+' '           Text
 "'else"       Literal.String.Symbol
 ' '           Text
 'opts'        Name.Variable
@@ -6955,13 +7700,15 @@
 'opts'        Name.Variable
 '\n\t\t\t\t\t\t  ' Text
 '('           Punctuation
-'cond'        Name.Function
+'cond'        Keyword
 '\n\t\t\t\t\t\t   ' Text
 '('           Punctuation
 '('           Punctuation
-'symbol? '    Name.Builtin
+'symbol?'     Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'opts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6971,9 +7718,11 @@
 '\n\t\t\t\t\t\t   ' Text
 '('           Punctuation
 '('           Punctuation
-'boolean? '   Name.Builtin
+'boolean?'    Name.Builtin
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'opts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -6983,23 +7732,28 @@
 '\n\t\t\t\t\t\t   ' Text
 '('           Punctuation
 '('           Punctuation
-'string? '    Name.Builtin
+'string?'     Name.Builtin
+' '           Text
 '('           Punctuation
-'caar '       Name.Builtin
+'caar'        Name.Builtin
+' '           Text
 'opts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'cdar '       Name.Builtin
+'cdar'        Name.Builtin
+' '           Text
 'opts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t\t\t\t\t\t   ' Text
 '('           Punctuation
-'else '       Keyword
+'else'        Keyword
+' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'opts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -7008,8 +7762,9 @@
 ')'           Punctuation
 '\n\t\t\t\t\t    ' Text
 '('           Punctuation
-'cdr '        Name.Builtin
-'case'        Name.Variable
+'cdr'         Name.Builtin
+' '           Text
+'case'        Keyword
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
@@ -7021,13 +7776,15 @@
 '\n    '      Text
 '`'           Operator
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 '%display-usage' Name.Function
 ' '           Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 ')'           Punctuation
 ' '           Text
@@ -7041,13 +7798,15 @@
 ')'           Punctuation
 '\n       '   Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 '%argv'       Name.Function
 ')'           Punctuation
 '\n\t '       Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '%next-arg'   Name.Variable
 ' '           Text
 '('           Punctuation
@@ -7068,7 +7827,8 @@
 "',kw-args"   Literal.String.Symbol
 '\n\t\t       ' Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 '%opt'        Name.Function
 ' '           Text
@@ -7078,7 +7838,8 @@
 ')'           Punctuation
 '\n\t\t\t '   Text
 '('           Punctuation
-'case '       Keyword
+'case'        Keyword
+' '           Text
 '%opt'        Name.Variable
 '\n\t\t\t   ' Text
 ',@'          Operator
@@ -7197,9 +7958,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'%print-module' Name.Function
+'%print-module' Name.Builtin
 ' '           Text
 'mod'         Name.Variable
 ' '           Text
@@ -7209,7 +7971,8 @@
 '; unused args: depth length style table)' Comment.Single
 '\n  '        Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '"'           Literal.String
 '#<'          Literal.String
 '"'           Literal.String
@@ -7218,11 +7981,13 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
-'module-kind' Name.Function
+'module-kind' Name.Builtin
 ' '           Text
 'mod'         Name.Variable
 ')'           Punctuation
@@ -7236,13 +8001,14 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'name'        Name.Function
 ' '           Text
 '('           Punctuation
-'module-name' Name.Function
+'module-name' Name.Builtin
 ' '           Text
 'mod'         Name.Variable
 ')'           Punctuation
@@ -7250,14 +8016,16 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 'name'        Name.Variable
 '\n\t'        Text
 '('           Punctuation
-'begin'       Name.Function
+'begin'       Keyword
 '\n\t  '      Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '"'           Literal.String
 ' '           Literal.String
 '"'           Literal.String
@@ -7266,7 +8034,8 @@
 ')'           Punctuation
 '\n\t  '      Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 'name'        Name.Variable
 ' '           Text
 'port'        Name.Variable
@@ -7276,7 +8045,8 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '"'           Literal.String
 ' '           Literal.String
 '"'           Literal.String
@@ -7285,11 +8055,13 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '('           Punctuation
-'number->string ' Name.Builtin
+'number->string' Name.Builtin
+' '           Text
 '('           Punctuation
-'object-address' Name.Function
+'object-address' Name.Builtin
 ' '           Text
 'mod'         Name.Variable
 ')'           Punctuation
@@ -7301,7 +8073,8 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'display '    Name.Builtin
+'display'     Name.Builtin
+' '           Text
 '"'           Literal.String
 '>'           Literal.String
 '"'           Literal.String
@@ -7342,11 +8115,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 'module-type' Name.Variable
 '\n  '        Text
 '('           Punctuation
-'make-record-type' Name.Function
+'make-record-type' Name.Builtin
 ' '           Text
 "'module"     Literal.String.Symbol
 '\n\t\t    '  Text
@@ -7373,7 +8147,7 @@
 'observer-id' Name.Variable
 ')'           Punctuation
 '\n\t\t    '  Text
-'%print-module' Name.Variable
+'%print-module' Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 '\n\n'        Text
@@ -7394,15 +8168,18 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'make-module' Name.Variable
+'define'      Keyword
+' '           Text
+'make-module' Name.Builtin
 '\n    '      Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 'args'        Name.Variable
 '\n\n      '  Text
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'parse-arg'   Name.Function
 ' '           Text
@@ -7412,11 +8189,14 @@
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'> '          Name.Builtin
+'>'           Name.Builtin
+' '           Text
 '('           Punctuation
-'length '     Name.Builtin
+'length'      Name.Builtin
+' '           Text
 'args'        Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -7424,7 +8204,8 @@
 ')'           Punctuation
 '\n\t    '    Text
 '('           Punctuation
-'list-ref '   Name.Builtin
+'list-ref'    Name.Builtin
+' '           Text
 'args'        Name.Variable
 ' '           Text
 'index'       Name.Variable
@@ -7435,11 +8216,14 @@
 ')'           Punctuation
 '\n\n      '  Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'> '          Name.Builtin
+'>'           Name.Builtin
+' '           Text
 '('           Punctuation
-'length '     Name.Builtin
+'length'      Name.Builtin
+' '           Text
 'args'        Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -7447,7 +8231,7 @@
 ')'           Punctuation
 '\n\t  '      Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 ' '           Text
 '"'           Literal.String
 'Too many args to make-module.' Literal.String
@@ -7458,7 +8242,8 @@
 ')'           Punctuation
 '\n\n      '  Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'size'        Name.Function
@@ -7500,17 +8285,20 @@
 ')'           Punctuation
 '\n\n\t'      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'integer? '   Name.Builtin
+'integer?'    Name.Builtin
+' '           Text
 'size'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t    '    Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 ' '           Text
 '"'           Literal.String
 'Illegal size to make-module.' Literal.String
@@ -7521,20 +8309,24 @@
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'list? '      Name.Builtin
+'list?'       Name.Builtin
+' '           Text
 'uses'        Name.Variable
 ')'           Punctuation
 '\n\t\t      ' Text
 '('           Punctuation
-'and-map'     Name.Function
+'and-map'     Name.Builtin
 ' '           Text
-'module?'     Name.Variable
+'module?'     Name.Builtin
 ' '           Text
 'uses'        Name.Variable
 ')'           Punctuation
@@ -7542,7 +8334,7 @@
 ')'           Punctuation
 '\n\t    '    Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 ' '           Text
 '"'           Literal.String
 'Incorrect use list.' Literal.String
@@ -7553,22 +8345,26 @@
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 'binder'      Name.Variable
 ' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'procedure? ' Name.Builtin
+'procedure?'  Name.Builtin
+' '           Text
 'binder'      Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n\t    '    Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 '\n\t     '   Text
 '"'           Literal.String
 'Lazy-binder expected to be a procedure or #f.' Literal.String
@@ -7579,16 +8375,18 @@
 ')'           Punctuation
 '\n\n\t'      Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'module'      Name.Function
 ' '           Text
 '('           Punctuation
-'module-constructor' Name.Function
+'module-constructor' Name.Builtin
 ' '           Text
 '('           Punctuation
-'make-vector ' Name.Builtin
+'make-vector' Name.Builtin
+' '           Text
 'size'        Name.Variable
 ' '           Text
 "'"           Operator
@@ -7613,7 +8411,7 @@
 ')'           Punctuation
 '\n\t\t\t\t\t  ' Text
 '('           Punctuation
-'make-weak-value-hash-table' Name.Function
+'make-weak-value-hash-table' Name.Builtin
 ' '           Text
 '31'          Literal.Number.Integer
 ')'           Punctuation
@@ -7649,11 +8447,12 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
-'module-constructor' Name.Variable
+'define'      Keyword
+' '           Text
+'module-constructor' Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-constructor' Name.Function
+'record-constructor' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ')'           Punctuation
@@ -7661,11 +8460,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'module-obarray' Name.Variable
+'define'      Keyword
+' '           Text
+'module-obarray' Name.Builtin
 '  '          Text
 '('           Punctuation
-'record-accessor' Name.Function
+'record-accessor' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7675,11 +8475,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'set-module-obarray!' Name.Variable
+'define'      Keyword
+' '           Text
+'set-module-obarray!' Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-modifier' Name.Function
+'record-modifier' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7689,11 +8490,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'module-uses' Name.Variable
+'define'      Keyword
+' '           Text
+'module-uses' Name.Builtin
 '  '          Text
 '('           Punctuation
-'record-accessor' Name.Function
+'record-accessor' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7703,11 +8505,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'set-module-uses!' Name.Variable
+'define'      Keyword
+' '           Text
+'set-module-uses!' Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-modifier' Name.Function
+'record-modifier' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7717,11 +8520,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'module-binder' Name.Variable
+'define'      Keyword
+' '           Text
+'module-binder' Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-accessor' Name.Function
+'record-accessor' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7731,11 +8535,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'set-module-binder!' Name.Variable
+'define'      Keyword
+' '           Text
+'set-module-binder!' Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-modifier' Name.Function
+'record-modifier' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7748,11 +8553,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 'module-eval-closure' Name.Variable
 ' '           Text
 '('           Punctuation
-'record-accessor' Name.Function
+'record-accessor' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7762,11 +8568,12 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
-'module-transformer' Name.Variable
+'define'      Keyword
+' '           Text
+'module-transformer' Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-accessor' Name.Function
+'record-accessor' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7776,11 +8583,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'set-module-transformer!' Name.Variable
+'define'      Keyword
+' '           Text
+'set-module-transformer!' Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-modifier' Name.Function
+'record-modifier' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7790,11 +8598,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'module-name' Name.Variable
+'define'      Keyword
+' '           Text
+'module-name' Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-accessor' Name.Function
+'record-accessor' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7804,11 +8613,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'set-module-name!' Name.Variable
+'define'      Keyword
+' '           Text
+'set-module-name!' Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-modifier' Name.Function
+'record-modifier' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7818,11 +8628,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'module-kind' Name.Variable
+'define'      Keyword
+' '           Text
+'module-kind' Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-accessor' Name.Function
+'record-accessor' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7832,11 +8643,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'set-module-kind!' Name.Variable
+'define'      Keyword
+' '           Text
+'set-module-kind!' Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-modifier' Name.Function
+'record-modifier' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7846,11 +8658,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'module-observers' Name.Variable
+'define'      Keyword
+' '           Text
+'module-observers' Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-accessor' Name.Function
+'record-accessor' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7860,11 +8673,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'set-module-observers!' Name.Variable
+'define'      Keyword
+' '           Text
+'set-module-observers!' Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-modifier' Name.Function
+'record-modifier' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7874,11 +8688,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'module-weak-observers' Name.Variable
+'define'      Keyword
+' '           Text
+'module-weak-observers' Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-accessor' Name.Function
+'record-accessor' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7888,11 +8703,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 'module-observer-id' Name.Variable
 ' '           Text
 '('           Punctuation
-'record-accessor' Name.Function
+'record-accessor' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7902,11 +8718,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 'set-module-observer-id!' Name.Variable
 ' '           Text
 '('           Punctuation
-'record-modifier' Name.Function
+'record-modifier' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7916,11 +8733,12 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
-'module?'     Name.Variable
+'define'      Keyword
+' '           Text
+'module?'     Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-predicate' Name.Function
+'record-predicate' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ')'           Punctuation
@@ -7928,17 +8746,19 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 'set-module-eval-closure!' Name.Variable
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
-'setter'      Name.Function
+'setter'      Name.Builtin
 ' '           Text
 '('           Punctuation
-'record-modifier' Name.Function
+'record-modifier' Name.Builtin
 ' '           Text
 'module-type' Name.Variable
 ' '           Text
@@ -7948,7 +8768,8 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'module'      Name.Function
 ' '           Text
@@ -7956,7 +8777,7 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'setter'      Name.Function
+'setter'      Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
@@ -7970,7 +8791,7 @@
 ';; to maximally one module.' Comment.Single
 '\n      '    Text
 '('           Punctuation
-'set-procedure-property!' Name.Function
+'set-procedure-property!' Name.Builtin
 ' '           Text
 'closure'     Name.Variable
 ' '           Text
@@ -7984,20 +8805,21 @@
 '\n\n'        Text
 
 '('           Punctuation
-'begin-deprecated' Name.Function
+'begin-deprecated' Keyword
 '\n '         Text
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'eval-in-module' Name.Function
 ' '           Text
-'exp'         Name.Variable
+'exp'         Name.Builtin
 ' '           Text
 'mod'         Name.Variable
 ')'           Punctuation
 '\n   '       Text
 '('           Punctuation
-'issue-deprecation-warning' Name.Function
+'issue-deprecation-warning' Name.Builtin
 '\n    '      Text
 '"'           Literal.String
 "`eval-in-module' is deprecated.  Use `eval' instead." Literal.String
@@ -8005,8 +8827,9 @@
 ')'           Punctuation
 '\n   '       Text
 '('           Punctuation
-'eval '       Name.Builtin
-'exp'         Name.Variable
+'eval'        Name.Builtin
+' '           Text
+'exp'         Name.Builtin
 ' '           Text
 'mod'         Name.Variable
 ')'           Punctuation
@@ -8021,9 +8844,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-observe' Name.Function
+'module-observe' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
@@ -8031,16 +8855,17 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'set-module-observers!' Name.Function
+'set-module-observers!' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
 '('           Punctuation
-'cons '       Name.Builtin
+'cons'        Name.Builtin
+' '           Text
 'proc'        Name.Variable
 ' '           Text
 '('           Punctuation
-'module-observers' Name.Function
+'module-observers' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ')'           Punctuation
@@ -8048,7 +8873,8 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'cons '       Name.Builtin
+'cons'        Name.Builtin
+' '           Text
 'module'      Name.Variable
 ' '           Text
 'proc'        Name.Variable
@@ -8057,9 +8883,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-observe-weak' Name.Function
+'module-observe-weak' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
@@ -8067,7 +8894,8 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'id'          Name.Function
@@ -8081,10 +8909,10 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'hash-set!'   Name.Function
+'hash-set!'   Name.Builtin
 ' '           Text
 '('           Punctuation
-'module-weak-observers' Name.Function
+'module-weak-observers' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ')'           Punctuation
@@ -8100,7 +8928,8 @@
 'module'      Name.Variable
 ' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 '1'           Literal.Number.Integer
 ' '           Text
 'id'          Name.Variable
@@ -8108,7 +8937,8 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'cons '       Name.Builtin
+'cons'        Name.Builtin
+' '           Text
 'module'      Name.Variable
 ' '           Text
 'id'          Name.Variable
@@ -8118,21 +8948,24 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-unobserve' Name.Function
+'module-unobserve' Name.Builtin
 ' '           Text
 'token'       Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'module'      Name.Function
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'token'       Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -8141,24 +8974,27 @@
 'id'          Name.Function
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'token'       Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'integer? '   Name.Builtin
+'integer?'    Name.Builtin
+' '           Text
 'id'          Name.Variable
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'hash-remove!' Name.Function
+'hash-remove!' Name.Builtin
 ' '           Text
 '('           Punctuation
-'module-weak-observers' Name.Function
+'module-weak-observers' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ')'           Punctuation
@@ -8167,17 +9003,17 @@
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'set-module-observers!' Name.Function
+'set-module-observers!' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
 '('           Punctuation
-'delq1!'      Name.Function
+'delq1!'      Name.Builtin
 ' '           Text
 'id'          Name.Variable
 ' '           Text
 '('           Punctuation
-'module-observers' Name.Function
+'module-observers' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ')'           Punctuation
@@ -8186,22 +9022,25 @@
 ')'           Punctuation
 ')'           Punctuation
 '\n  '        Text
-'*unspecified*' Name.Variable
+'*unspecified*' Keyword
 ')'           Punctuation
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-modified' Name.Function
+'module-modified' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'for-each '   Name.Builtin
+'for-each'    Name.Builtin
+' '           Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'proc'        Name.Function
 ')'           Punctuation
@@ -8214,17 +9053,18 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'module-observers' Name.Function
+'module-observers' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'hash-fold'   Name.Function
+'hash-fold'   Name.Builtin
 ' '           Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'id'          Name.Function
 ' '           Text
@@ -8243,7 +9083,7 @@
 '#f'          Name.Constant
 ' '           Text
 '('           Punctuation
-'module-weak-observers' Name.Function
+'module-weak-observers' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -8318,9 +9158,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-search' Name.Function
+'module-search' Name.Builtin
 ' '           Text
 'fn'          Name.Variable
 ' '           Text
@@ -8330,7 +9171,8 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'loop'        Name.Function
 ' '           Text
@@ -8338,21 +9180,25 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'pair? '      Name.Builtin
+'pair?'       Name.Builtin
+' '           Text
 'pos'         Name.Variable
 ')'           Punctuation
 '\n\t '       Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
-'module-search' Name.Function
+'module-search' Name.Builtin
 ' '           Text
 'fn'          Name.Variable
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'pos'         Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -8363,7 +9209,8 @@
 'loop'        Name.Function
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'pos'         Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -8372,7 +9219,8 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
 'fn'          Name.Function
 ' '           Text
@@ -8385,7 +9233,7 @@
 'loop'        Name.Function
 ' '           Text
 '('           Punctuation
-'module-uses' Name.Function
+'module-uses' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -8422,9 +9270,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-locally-bound?' Name.Function
+'module-locally-bound?' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -8432,13 +9281,14 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'var'         Name.Function
 ' '           Text
 '('           Punctuation
-'module-local-variable' Name.Function
+'module-local-variable' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -8448,11 +9298,12 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 'var'         Name.Variable
 '\n\t '       Text
 '('           Punctuation
-'variable-bound?' Name.Function
+'variable-bound?' Name.Builtin
 ' '           Text
 'var'         Name.Variable
 ')'           Punctuation
@@ -8477,9 +9328,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-bound?' Name.Function
+'module-bound?' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -8487,9 +9339,9 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'module-search' Name.Function
+'module-search' Name.Builtin
 ' '           Text
-'module-locally-bound?' Name.Variable
+'module-locally-bound?' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -8541,9 +9393,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-obarray-get-handle' Name.Function
+'module-obarray-get-handle' Name.Builtin
 ' '           Text
 'ob'          Name.Variable
 ' '           Text
@@ -8552,15 +9405,17 @@
 '\n  '        Text
 '('           Punctuation
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'symbol? '    Name.Builtin
+'symbol?'     Name.Builtin
+' '           Text
 'key'         Name.Variable
 ')'           Punctuation
 ' '           Text
-'hashq-get-handle' Name.Variable
+'hashq-get-handle' Name.Builtin
 ' '           Text
-'hash-get-handle' Name.Variable
+'hash-get-handle' Name.Builtin
 ')'           Punctuation
 ' '           Text
 'ob'          Name.Variable
@@ -8571,9 +9426,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-obarray-ref' Name.Function
+'module-obarray-ref' Name.Builtin
 ' '           Text
 'ob'          Name.Variable
 ' '           Text
@@ -8582,15 +9438,17 @@
 '\n  '        Text
 '('           Punctuation
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'symbol? '    Name.Builtin
+'symbol?'     Name.Builtin
+' '           Text
 'key'         Name.Variable
 ')'           Punctuation
 ' '           Text
-'hashq-ref'   Name.Variable
+'hashq-ref'   Name.Builtin
 ' '           Text
-'hash-ref'    Name.Variable
+'hash-ref'    Name.Builtin
 ')'           Punctuation
 ' '           Text
 'ob'          Name.Variable
@@ -8601,9 +9459,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-obarray-set!' Name.Function
+'module-obarray-set!' Name.Builtin
 ' '           Text
 'ob'          Name.Variable
 ' '           Text
@@ -8614,15 +9473,17 @@
 '\n  '        Text
 '('           Punctuation
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'symbol? '    Name.Builtin
+'symbol?'     Name.Builtin
+' '           Text
 'key'         Name.Variable
 ')'           Punctuation
 ' '           Text
-'hashq-set!'  Name.Variable
+'hashq-set!'  Name.Builtin
 ' '           Text
-'hash-set!'   Name.Variable
+'hash-set!'   Name.Builtin
 ')'           Punctuation
 ' '           Text
 'ob'          Name.Variable
@@ -8635,9 +9496,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-obarray-remove!' Name.Function
+'module-obarray-remove!' Name.Builtin
 ' '           Text
 'ob'          Name.Variable
 ' '           Text
@@ -8646,15 +9508,17 @@
 '\n  '        Text
 '('           Punctuation
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'symbol? '    Name.Builtin
+'symbol?'     Name.Builtin
+' '           Text
 'key'         Name.Variable
 ')'           Punctuation
 ' '           Text
-'hashq-remove!' Name.Variable
+'hashq-remove!' Name.Builtin
 ' '           Text
-'hash-remove!' Name.Variable
+'hash-remove!' Name.Builtin
 ')'           Punctuation
 ' '           Text
 'ob'          Name.Variable
@@ -8683,9 +9547,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-symbol-locally-interned?' Name.Function
+'module-symbol-locally-interned?' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -8693,14 +9558,16 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'module-obarray-get-handle' Name.Function
+'module-obarray-get-handle' Name.Builtin
 ' '           Text
 '('           Punctuation
-'module-obarray' Name.Function
+'module-obarray' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -8731,9 +9598,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-symbol-interned?' Name.Function
+'module-symbol-interned?' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -8741,9 +9609,9 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'module-search' Name.Function
+'module-search' Name.Builtin
 ' '           Text
-'module-symbol-locally-interned?' Name.Variable
+'module-symbol-locally-interned?' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -8807,9 +9675,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-local-variable' Name.Function
+'module-local-variable' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -8823,16 +9692,17 @@
 ';   (list m v' Comment.Single
 '\n\t '       Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'b'           Name.Function
 ' '           Text
 '('           Punctuation
-'module-obarray-ref' Name.Function
+'module-obarray-ref' Name.Builtin
 ' '           Text
 '('           Punctuation
-'module-obarray' Name.Function
+'module-obarray' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -8843,11 +9713,13 @@
 ')'           Punctuation
 '\n\t   '     Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'variable?'   Name.Function
+'variable?'   Name.Builtin
 ' '           Text
 'b'           Name.Variable
 ')'           Punctuation
@@ -8856,16 +9728,17 @@
 ')'           Punctuation
 '\n\t       ' Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'module-binder' Name.Function
+'module-binder' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
 '\n\t\t    '  Text
 '('           Punctuation
 '('           Punctuation
-'module-binder' Name.Function
+'module-binder' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -8910,9 +9783,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-variable' Name.Function
+'module-variable' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -8920,9 +9794,9 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'module-search' Name.Function
+'module-search' Name.Builtin
 ' '           Text
-'module-local-variable' Name.Variable
+'module-local-variable' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -8968,9 +9842,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-symbol-local-binding' Name.Function
+'module-symbol-local-binding' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -8982,13 +9857,14 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'var'         Name.Function
 ' '           Text
 '('           Punctuation
-'module-local-variable' Name.Function
+'module-local-variable' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -8998,32 +9874,37 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 'var'         Name.Variable
 '\n\t'        Text
 '('           Punctuation
-'variable-ref' Name.Function
+'variable-ref' Name.Builtin
 ' '           Text
 'var'         Name.Variable
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 'opt-val'     Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t    '    Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'opt-val'     Name.Variable
 ')'           Punctuation
 '\n\t    '    Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 ' '           Text
 '"'           Literal.String
 'Locally unbound variable.' Literal.String
@@ -9059,9 +9940,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-symbol-binding' Name.Function
+'module-symbol-binding' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -9073,13 +9955,14 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'var'         Name.Function
 ' '           Text
 '('           Punctuation
-'module-variable' Name.Function
+'module-variable' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -9089,32 +9972,37 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 'var'         Name.Variable
 '\n\t'        Text
 '('           Punctuation
-'variable-ref' Name.Function
+'variable-ref' Name.Builtin
 ' '           Text
 'var'         Name.Variable
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 'opt-val'     Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t    '    Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'opt-val'     Name.Variable
 ')'           Punctuation
 '\n\t    '    Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 ' '           Text
 '"'           Literal.String
 'Unbound variable.' Literal.String
@@ -9156,9 +10044,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-make-local-var!' Name.Function
+'module-make-local-var!' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -9166,18 +10055,20 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'b'           Name.Function
 ' '           Text
 '('           Punctuation
-'module-obarray-ref' Name.Function
+'module-obarray-ref' Name.Builtin
 ' '           Text
 '('           Punctuation
-'module-obarray' Name.Function
+'module-obarray' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -9188,18 +10079,19 @@
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'variable?'   Name.Function
+'variable?'   Name.Builtin
 ' '           Text
 'b'           Name.Variable
 ')'           Punctuation
 '\n\t     '   Text
 '('           Punctuation
-'begin'       Name.Function
+'begin'       Keyword
 '\n\t       ' Text
 '('           Punctuation
-'module-modified' Name.Function
+'module-modified' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -9210,16 +10102,17 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'module-binder' Name.Function
+'module-binder' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
 '\n\t   '     Text
 '('           Punctuation
 '('           Punctuation
-'module-binder' Name.Function
+'module-binder' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -9233,16 +10126,17 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'begin'       Name.Function
+'begin'       Keyword
 '\n\t'        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'answer'      Name.Function
 ' '           Text
 '('           Punctuation
-'make-undefined-variable' Name.Function
+'make-undefined-variable' Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
@@ -9256,10 +10150,10 @@
 ')'           Punctuation
 '\n\t  '      Text
 '('           Punctuation
-'module-obarray-set!' Name.Function
+'module-obarray-set!' Name.Builtin
 ' '           Text
 '('           Punctuation
-'module-obarray' Name.Function
+'module-obarray' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -9270,7 +10164,7 @@
 ')'           Punctuation
 '\n\t  '      Text
 '('           Punctuation
-'module-modified' Name.Function
+'module-modified' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -9301,33 +10195,36 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-ensure-local-variable!' Name.Function
+'module-ensure-local-variable!' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
-'symbol'      Name.Variable
+'symbol'      Name.Builtin
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'or '         Keyword
+'or'          Keyword
+' '           Text
 '('           Punctuation
-'module-local-variable' Name.Function
+'module-local-variable' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
-'symbol'      Name.Variable
+'symbol'      Name.Builtin
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'var'         Name.Function
 ' '           Text
 '('           Punctuation
-'make-undefined-variable' Name.Function
+'make-undefined-variable' Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
@@ -9337,15 +10234,15 @@
 ' '           Text
 'var'         Name.Variable
 ' '           Text
-'symbol'      Name.Variable
+'symbol'      Name.Builtin
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'module-add!' Name.Function
+'module-add!' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
-'symbol'      Name.Variable
+'symbol'      Name.Builtin
 ' '           Text
 'var'         Name.Variable
 ')'           Punctuation
@@ -9369,9 +10266,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-add!' Name.Function
+'module-add!' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -9381,18 +10279,20 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'variable?'   Name.Function
+'variable?'   Name.Builtin
 ' '           Text
 'var'         Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 ' '           Text
 '"'           Literal.String
 'Bad variable to module-add!' Literal.String
@@ -9403,10 +10303,10 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'module-obarray-set!' Name.Function
+'module-obarray-set!' Name.Builtin
 ' '           Text
 '('           Punctuation
-'module-obarray' Name.Function
+'module-obarray' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -9417,7 +10317,7 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'module-modified' Name.Function
+'module-modified' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -9437,9 +10337,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-remove!' Name.Function
+'module-remove!' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
@@ -9447,10 +10348,10 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'module-obarray-remove!' Name.Function
+'module-obarray-remove!' Name.Builtin
 '  '          Text
 '('           Punctuation
-'module-obarray' Name.Function
+'module-obarray' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -9459,7 +10360,7 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'module-modified' Name.Function
+'module-modified' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -9467,17 +10368,19 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-clear!' Name.Function
+'module-clear!' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'vector-fill! ' Name.Builtin
+'vector-fill!' Name.Builtin
+' '           Text
 '('           Punctuation
-'module-obarray' Name.Function
+'module-obarray' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -9488,7 +10391,7 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'module-modified' Name.Function
+'module-modified' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ')'           Punctuation
@@ -9508,9 +10411,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-for-each' Name.Function
+'module-for-each' Name.Builtin
 ' '           Text
 'proc'        Name.Variable
 ' '           Text
@@ -9518,13 +10422,14 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'obarray'     Name.Function
 ' '           Text
 '('           Punctuation
-'module-obarray' Name.Function
+'module-obarray' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ')'           Punctuation
@@ -9532,7 +10437,8 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'do '         Keyword
+'do'          Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'index'       Name.Function
@@ -9540,7 +10446,8 @@
 '0'           Literal.Number.Integer
 ' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 'index'       Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
@@ -9551,7 +10458,8 @@
 'end'         Name.Function
 ' '           Text
 '('           Punctuation
-'vector-length ' Name.Builtin
+'vector-length' Name.Builtin
+' '           Text
 'obarray'     Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -9559,7 +10467,8 @@
 '\n\t'        Text
 '('           Punctuation
 '('           Punctuation
-'= '          Name.Builtin
+'='           Name.Builtin
+' '           Text
 'index'       Name.Variable
 ' '           Text
 'end'         Name.Variable
@@ -9567,10 +10476,11 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'for-each'    Name.Function
+'for-each'    Name.Builtin
 '\n       '   Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'bucket'      Name.Function
 ')'           Punctuation
@@ -9579,19 +10489,22 @@
 'proc'        Name.Function
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'bucket'      Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'bucket'      Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n       '   Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obarray'     Name.Variable
 ' '           Text
 'index'       Name.Variable
@@ -9603,9 +10516,10 @@
 '\n\n\n'      Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-map'  Name.Function
+'module-map'  Name.Builtin
 ' '           Text
 'proc'        Name.Variable
 ' '           Text
@@ -9613,13 +10527,14 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let* '       Keyword
+'let*'        Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'obarray'     Name.Function
 ' '           Text
 '('           Punctuation
-'module-obarray' Name.Function
+'module-obarray' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ')'           Punctuation
@@ -9629,14 +10544,16 @@
 'end'         Name.Function
 ' '           Text
 '('           Punctuation
-'vector-length ' Name.Builtin
+'vector-length' Name.Builtin
+' '           Text
 'obarray'     Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n\n    '    Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 'loop'        Name.Variable
 ' '           Text
 '('           Punctuation
@@ -9656,9 +10573,11 @@
 ')'           Punctuation
 '\n      '    Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'= '          Name.Builtin
+'='           Name.Builtin
+' '           Text
 'i'           Name.Variable
 ' '           Text
 'end'         Name.Variable
@@ -9670,19 +10589,22 @@
 'loop'        Name.Function
 ' '           Text
 '('           Punctuation
-'+ '          Name.Builtin
+'+'           Name.Builtin
+' '           Text
 '1'           Literal.Number.Integer
 ' '           Text
 'i'           Name.Variable
 ')'           Punctuation
 '\n\t\t'      Text
 '('           Punctuation
-'append!'     Name.Function
+'append!'     Name.Builtin
 '\n\t\t '     Text
 '('           Punctuation
-'map '        Name.Builtin
+'map'         Name.Builtin
+' '           Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'bucket'      Name.Function
 ')'           Punctuation
@@ -9691,19 +10613,22 @@
 'proc'        Name.Function
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'bucket'      Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'bucket'      Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
 '\n\t\t      ' Text
 '('           Punctuation
-'vector-ref ' Name.Builtin
+'vector-ref'  Name.Builtin
+' '           Text
 'obarray'     Name.Variable
 ' '           Text
 'i'           Name.Variable
@@ -9747,19 +10672,21 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'make-root-module' Name.Function
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'm'           Name.Function
 ' '           Text
 '('           Punctuation
-'make-module' Name.Function
+'make-module' Name.Builtin
 ' '           Text
 '0'           Literal.Number.Integer
 ')'           Punctuation
@@ -9767,12 +10694,12 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'set-module-obarray!' Name.Function
+'set-module-obarray!' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
 '('           Punctuation
-'%get-pre-modules-obarray' Name.Function
+'%get-pre-modules-obarray' Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 '\n    '      Text
@@ -9791,19 +10718,21 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'make-scm-module' Name.Function
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'm'           Name.Function
 ' '           Text
 '('           Punctuation
-'make-module' Name.Function
+'make-module' Name.Builtin
 ' '           Text
 '0'           Literal.Number.Integer
 ')'           Punctuation
@@ -9811,12 +10740,12 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'set-module-obarray!' Name.Function
+'set-module-obarray!' Name.Builtin
 ' '           Text
 'm'           Name.Variable
 ' '           Text
 '('           Punctuation
-'%get-pre-modules-obarray' Name.Function
+'%get-pre-modules-obarray' Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 '\n    '      Text
@@ -9844,21 +10773,23 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'save-module-excursion' Name.Function
+'save-module-excursion' Name.Builtin
 ' '           Text
 'thunk'       Name.Variable
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'inner-module' Name.Function
 ' '           Text
 '('           Punctuation
-'current-module' Name.Function
+'current-module' Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 '\n\t'        Text
@@ -9870,29 +10801,33 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'dynamic-wind ' Name.Builtin
+'dynamic-wind' Name.Builtin
+' '           Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 ')'           Punctuation
 '\n\t\t    '  Text
 '('           Punctuation
-'set! '       Keyword
+'set!'        Keyword
+' '           Text
 'outer-module' Name.Variable
 ' '           Text
 '('           Punctuation
-'current-module' Name.Function
+'current-module' Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 '\n\t\t    '  Text
 '('           Punctuation
-'set-current-module' Name.Function
+'set-current-module' Name.Builtin
 ' '           Text
 'inner-module' Name.Variable
 ')'           Punctuation
 '\n\t\t    '  Text
 '('           Punctuation
-'set! '       Keyword
+'set!'        Keyword
+' '           Text
 'inner-module' Name.Variable
 ' '           Text
 '#f'          Name.Constant
@@ -9902,27 +10837,30 @@
 'thunk'       Name.Variable
 '\n\t\t  '    Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 ')'           Punctuation
 '\n\t\t    '  Text
 '('           Punctuation
-'set! '       Keyword
+'set!'        Keyword
+' '           Text
 'inner-module' Name.Variable
 ' '           Text
 '('           Punctuation
-'current-module' Name.Function
+'current-module' Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 '\n\t\t    '  Text
 '('           Punctuation
-'set-current-module' Name.Function
+'set-current-module' Name.Builtin
 ' '           Text
 'outer-module' Name.Variable
 ')'           Punctuation
 '\n\t\t    '  Text
 '('           Punctuation
-'set! '       Keyword
+'set!'        Keyword
+' '           Text
 'outer-module' Name.Variable
 ' '           Text
 '#f'          Name.Constant
@@ -9934,15 +10872,17 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 'basic-load'  Name.Variable
 ' '           Text
-'load'        Name.Variable
+'load'        Keyword
 ')'           Punctuation
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
 'load-module' Name.Function
 ' '           Text
@@ -9950,30 +10890,33 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'save-module-excursion' Name.Function
+'save-module-excursion' Name.Builtin
 '\n   '       Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 ')'           Punctuation
 '\n     '     Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'oldname'     Name.Function
 ' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 '('           Punctuation
-'current-load-port' Name.Function
+'current-load-port' Name.Builtin
 ')'           Punctuation
 '\n\t\t\t '   Text
 '('           Punctuation
-'port-filename' Name.Function
+'port-filename' Name.Builtin
 ' '           Text
 '('           Punctuation
-'current-load-port' Name.Function
+'current-load-port' Name.Builtin
 ')'           Punctuation
 ')'           Punctuation
 ')'           Punctuation
@@ -9984,15 +10927,19 @@
 'basic-load'  Name.Function
 ' '           Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 'oldname'     Name.Variable
 '\n\t\t\t    ' Text
 '('           Punctuation
-'> '          Name.Builtin
+'>'           Name.Builtin
+' '           Text
 '('           Punctuation
-'string-length ' Name.Builtin
+'string-length' Name.Builtin
+' '           Text
 'filename'    Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -10000,11 +10947,14 @@
 ')'           Punctuation
 '\n\t\t\t    ' Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'char=? '     Name.Builtin
+'char=?'      Name.Builtin
+' '           Text
 '('           Punctuation
-'string-ref ' Name.Builtin
+'string-ref'  Name.Builtin
+' '           Text
 'filename'    Name.Variable
 ' '           Text
 '0'           Literal.Number.Integer
@@ -10015,11 +10965,13 @@
 ')'           Punctuation
 '\n\t\t\t    ' Text
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'string=? '   Name.Builtin
+'string=?'    Name.Builtin
+' '           Text
 '('           Punctuation
-'dirname'     Name.Function
+'dirname'     Name.Builtin
 ' '           Text
 'oldname'     Name.Variable
 ')'           Punctuation
@@ -10032,9 +10984,10 @@
 ')'           Punctuation
 '\n\t\t       ' Text
 '('           Punctuation
-'string-append ' Name.Builtin
+'string-append' Name.Builtin
+' '           Text
 '('           Punctuation
-'dirname'     Name.Function
+'dirname'     Name.Builtin
 ' '           Text
 'oldname'     Name.Variable
 ')'           Punctuation
@@ -10074,9 +11027,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-ref'  Name.Function
+'module-ref'  Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
@@ -10088,13 +11042,14 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'variable'    Name.Function
 ' '           Text
 '('           Punctuation
-'module-variable' Name.Function
+'module-variable' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
@@ -10104,33 +11059,37 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 'variable'    Name.Variable
 ' '           Text
 '('           Punctuation
-'variable-bound?' Name.Function
+'variable-bound?' Name.Builtin
 ' '           Text
 'variable'    Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'variable-ref' Name.Function
+'variable-ref' Name.Builtin
 ' '           Text
 'variable'    Name.Variable
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 'rest'        Name.Variable
 ')'           Punctuation
 '\n\t    '    Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 ' '           Text
 '"'           Literal.String
 'No variable named' Literal.String
@@ -10144,7 +11103,8 @@
 ')'           Punctuation
 '\n\t    '    Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'rest'        Name.Variable
 ')'           Punctuation
 '\t\t\t'      Text
@@ -10172,9 +11132,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-set!' Name.Function
+'module-set!' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
@@ -10184,13 +11145,14 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'variable'    Name.Function
 ' '           Text
 '('           Punctuation
-'module-variable' Name.Function
+'module-variable' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
@@ -10200,11 +11162,12 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 'variable'    Name.Variable
 '\n\t'        Text
 '('           Punctuation
-'variable-set!' Name.Function
+'variable-set!' Name.Builtin
 ' '           Text
 'variable'    Name.Variable
 ' '           Text
@@ -10212,7 +11175,7 @@
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'error'       Name.Function
+'error'       Name.Builtin
 ' '           Text
 '"'           Literal.String
 'No variable named' Literal.String
@@ -10245,9 +11208,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-define!' Name.Function
+'module-define!' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
@@ -10257,13 +11221,14 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'variable'    Name.Function
 ' '           Text
 '('           Punctuation
-'module-local-variable' Name.Function
+'module-local-variable' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
@@ -10273,14 +11238,15 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 'variable'    Name.Variable
 '\n\t'        Text
 '('           Punctuation
-'begin'       Name.Function
+'begin'       Keyword
 '\n\t  '      Text
 '('           Punctuation
-'variable-set!' Name.Function
+'variable-set!' Name.Builtin
 ' '           Text
 'variable'    Name.Variable
 ' '           Text
@@ -10288,20 +11254,21 @@
 ')'           Punctuation
 '\n\t  '      Text
 '('           Punctuation
-'module-modified' Name.Function
+'module-modified' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'variable'    Name.Function
 ' '           Text
 '('           Punctuation
-'make-variable' Name.Function
+'make-variable' Name.Builtin
 ' '           Text
 'value'       Name.Variable
 ')'           Punctuation
@@ -10317,7 +11284,7 @@
 ')'           Punctuation
 '\n\t  '      Text
 '('           Punctuation
-'module-add!' Name.Function
+'module-add!' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
@@ -10347,9 +11314,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-defined?' Name.Function
+'module-defined?' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
@@ -10357,13 +11325,14 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 '('           Punctuation
 '('           Punctuation
 'variable'    Name.Function
 ' '           Text
 '('           Punctuation
-'module-variable' Name.Function
+'module-variable' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
@@ -10373,11 +11342,12 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'and '        Keyword
+'and'         Keyword
+' '           Text
 'variable'    Name.Variable
 ' '           Text
 '('           Punctuation
-'variable-bound?' Name.Function
+'variable-bound?' Name.Builtin
 ' '           Text
 'variable'    Name.Variable
 ')'           Punctuation
@@ -10399,9 +11369,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'module-use!' Name.Function
+'module-use!' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ' '           Text
@@ -10409,21 +11380,22 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'set-module-uses!' Name.Function
+'set-module-uses!' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 '\n\t\t    '  Text
 '('           Punctuation
-'cons '       Name.Builtin
+'cons'        Name.Builtin
+' '           Text
 'interface'   Name.Variable
 ' '           Text
 '('           Punctuation
-'delq!'       Name.Function
+'delq!'       Name.Builtin
 ' '           Text
 'interface'   Name.Variable
 ' '           Text
 '('           Punctuation
-'module-uses' Name.Function
+'module-uses' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ')'           Punctuation
@@ -10432,7 +11404,7 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'module-modified' Name.Function
+'module-modified' Name.Builtin
 ' '           Text
 'module'      Name.Variable
 ')'           Punctuation
@@ -10542,9 +11514,10 @@
 '\n\n\n'      Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'nested-ref'  Name.Function
+'nested-ref'  Name.Builtin
 ' '           Text
 'root'        Name.Variable
 ' '           Text
@@ -10552,7 +11525,8 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 'loop'        Name.Variable
 ' '           Text
 '('           Punctuation
@@ -10570,11 +11544,12 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'cond'        Name.Function
+'cond'        Keyword
 '\n     '     Text
 '('           Punctuation
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 'elts'        Name.Variable
 ')'           Punctuation
 '\t\t'        Text
@@ -10583,9 +11558,10 @@
 '\n     '     Text
 '('           Punctuation
 '('           Punctuation
-'not '        Name.Builtin
+'not'         Name.Builtin
+' '           Text
 '('           Punctuation
-'module?'     Name.Function
+'module?'     Name.Builtin
 ' '           Text
 'cur'         Name.Variable
 ')'           Punctuation
@@ -10595,17 +11571,19 @@
 ')'           Punctuation
 '\n     '     Text
 '('           Punctuation
-'else '       Keyword
+'else'        Keyword
+' '           Text
 '('           Punctuation
 'loop'        Name.Function
 ' '           Text
 '('           Punctuation
-'module-ref'  Name.Function
+'module-ref'  Name.Builtin
 ' '           Text
 'cur'         Name.Variable
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'elts'        Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -10613,7 +11591,8 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'elts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -10624,9 +11603,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'nested-set!' Name.Function
+'nested-set!' Name.Builtin
 ' '           Text
 'root'        Name.Variable
 ' '           Text
@@ -10636,7 +11616,8 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 'loop'        Name.Variable
 ' '           Text
 '('           Punctuation
@@ -10654,22 +11635,26 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'elts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'module-set!' Name.Function
+'module-set!' Name.Builtin
 ' '           Text
 'cur'         Name.Variable
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'elts'        Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -10680,18 +11665,20 @@
 'loop'        Name.Function
 ' '           Text
 '('           Punctuation
-'module-ref'  Name.Function
+'module-ref'  Name.Builtin
 ' '           Text
 'cur'         Name.Variable
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'elts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'elts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -10701,9 +11688,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'nested-define!' Name.Function
+'nested-define!' Name.Builtin
 ' '           Text
 'root'        Name.Variable
 ' '           Text
@@ -10713,7 +11701,8 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 'loop'        Name.Variable
 ' '           Text
 '('           Punctuation
@@ -10731,22 +11720,26 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'elts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'module-define!' Name.Function
+'module-define!' Name.Builtin
 ' '           Text
 'cur'         Name.Variable
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'elts'        Name.Variable
 ')'           Punctuation
 ' '           Text
@@ -10757,18 +11750,20 @@
 'loop'        Name.Function
 ' '           Text
 '('           Punctuation
-'module-ref'  Name.Function
+'module-ref'  Name.Builtin
 ' '           Text
 'cur'         Name.Variable
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'elts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'elts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -10778,9 +11773,10 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'nested-remove!' Name.Function
+'nested-remove!' Name.Builtin
 ' '           Text
 'root'        Name.Variable
 ' '           Text
@@ -10788,7 +11784,8 @@
 ')'           Punctuation
 '\n  '        Text
 '('           Punctuation
-'let '        Keyword
+'let'         Keyword
+' '           Text
 'loop'        Name.Variable
 ' '           Text
 '('           Punctuation
@@ -10806,22 +11803,26 @@
 ')'           Punctuation
 '\n    '      Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'null? '      Name.Builtin
+'null?'       Name.Builtin
+' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'elts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 '\n\t'        Text
 '('           Punctuation
-'module-remove!' Name.Function
+'module-remove!' Name.Builtin
 ' '           Text
 'cur'         Name.Variable
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'elts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -10830,18 +11831,20 @@
 'loop'        Name.Function
 ' '           Text
 '('           Punctuation
-'module-ref'  Name.Function
+'module-ref'  Name.Builtin
 ' '           Text
 'cur'         Name.Variable
 ' '           Text
 '('           Punctuation
-'car '        Name.Builtin
+'car'         Name.Builtin
+' '           Text
 'elts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'cdr '        Name.Builtin
+'cdr'         Name.Builtin
+' '           Text
 'elts'        Name.Variable
 ')'           Punctuation
 ')'           Punctuation
@@ -10851,18 +11854,19 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'local-ref'   Name.Function
+'local-ref'   Name.Builtin
 ' '           Text
 'names'       Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'nested-ref'  Name.Function
+'nested-ref'  Name.Builtin
 ' '           Text
 '('           Punctuation
-'current-module' Name.Function
+'current-module' Name.Builtin
 ')'           Punctuation
 ' '           Text
 'names'       Name.Variable
@@ -10871,9 +11875,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'local-set!'  Name.Function
+'local-set!'  Name.Builtin
 ' '           Text
 'names'       Name.Variable
 ' '           Text
@@ -10881,10 +11886,10 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'nested-set!' Name.Function
+'nested-set!' Name.Builtin
 ' '           Text
 '('           Punctuation
-'current-module' Name.Function
+'current-module' Name.Builtin
 ')'           Punctuation
 ' '           Text
 'names'       Name.Variable
@@ -10895,9 +11900,10 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'local-define' Name.Function
+'local-define' Name.Builtin
 ' '           Text
 'names'       Name.Variable
 ' '           Text
@@ -10905,10 +11911,10 @@
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'nested-define!' Name.Function
+'nested-define!' Name.Builtin
 ' '           Text
 '('           Punctuation
-'current-module' Name.Function
+'current-module' Name.Builtin
 ')'           Punctuation
 ' '           Text
 'names'       Name.Variable
@@ -10919,18 +11925,19 @@
 '\n'          Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 '('           Punctuation
-'local-remove' Name.Function
+'local-remove' Name.Builtin
 ' '           Text
 'names'       Name.Variable
 ')'           Punctuation
 ' '           Text
 '('           Punctuation
-'nested-remove!' Name.Function
+'nested-remove!' Name.Builtin
 ' '           Text
 '('           Punctuation
-'current-module' Name.Function
+'current-module' Name.Builtin
 ')'           Punctuation
 ' '           Text
 'names'       Name.Variable
diff --git a/tests/examplefiles/scheme/r6rs-comments.scm.output b/tests/examplefiles/scheme/r6rs-comments.scm.output
index 4bfa3a0d..a8232cd4 100644
--- a/tests/examplefiles/scheme/r6rs-comments.scm.output
+++ b/tests/examplefiles/scheme/r6rs-comments.scm.output
@@ -8,11 +8,13 @@
 '\n\n'        Text
 
 '('           Punctuation
-'define '     Keyword
+'define'      Keyword
+' '           Text
 'fact'        Name.Variable
 '\n\n  '      Text
 '('           Punctuation
-'lambda '     Keyword
+'lambda'      Keyword
+' '           Text
 '('           Punctuation
 'n'           Name.Function
 ')'           Punctuation
@@ -20,9 +22,11 @@
 ';; base case' Comment.Single
 '\n\n    '    Text
 '('           Punctuation
-'if '         Keyword
+'if'          Keyword
+' '           Text
 '('           Punctuation
-'= '          Name.Builtin
+'='           Name.Builtin
+' '           Text
 'n'           Name.Variable
 ' '           Text
 '0'           Literal.Number.Integer
@@ -37,14 +41,16 @@
 '; identity of *' Comment.Single
 '\n\n        ' Text
 '('           Punctuation
-'* '          Name.Builtin
+'*'           Name.Builtin
+' '           Text
 'n'           Name.Variable
 ' '           Text
 '('           Punctuation
 'fact'        Name.Function
 ' '           Text
 '('           Punctuation
-'- '          Name.Builtin
+'-'           Name.Builtin
+' '           Text
 'n'           Name.Variable
 ' '           Text
 '1'           Literal.Number.Integer
diff --git a/tests/snippets/scheme/numbers.txt b/tests/snippets/scheme/numbers.txt
index 206d3f66..a49d9baf 100644
--- a/tests/snippets/scheme/numbers.txt
+++ b/tests/snippets/scheme/numbers.txt
@@ -147,22 +147,22 @@ nan
 ';; These are not numbers but plain symbols.' Comment.Single
 '\n\n'        Text
 
-'1+'          Name.Variable
+'1+'          Name.Builtin
 '\n'          Text
 
-'1-'          Name.Variable
+'1-'          Name.Builtin
 '\n'          Text
 
 'i'           Name.Variable
 '\n'          Text
 
-'inf'         Name.Variable
+'inf'         Name.Builtin
 '\n'          Text
 
 '-inf'        Name.Variable
 '\n'          Text
 
-'nan'         Name.Variable
+'nan'         Name.Builtin
 '\n'          Text
 
 '-nan'        Name.Variable