diff --git a/guide.tcg b/guide.tcg
index 9b19426..2f8f046 100644
--- a/guide.tcg
+++ b/guide.tcg
@@ -482,8 +482,8 @@ This is the only informative text block in this document.
 
 These blocks can contain multiple paragraphs.
 
-These blocks can even contain tables! However, be wary of providing tables that are
-too large in an Informative Text block.
+These blocks can even contain tables! However, be wary of providing tables that
+are too large in an Informative Text block.
 
 | Document Type     | Informative Blocks     |
 | ----------------- | ---------------------- |
@@ -500,8 +500,8 @@ This is the only informative text block in this document.
 
 These blocks can contain multiple paragraphs.
 
-These blocks can even contain tables! However, be wary of providing tables that are
-too large in an Informative Text block.
+These blocks can even contain tables! However, be wary of providing tables that
+are too large in an Informative Text block.
 
 | Document Type     | Informative Blocks     |
 | ----------------- | ---------------------- |
diff --git a/template/tcg.tex b/template/tcg.tex
index b7d9f42..6ea5d86 100644
--- a/template/tcg.tex
+++ b/template/tcg.tex
@@ -161,19 +161,14 @@
 % }
 % \makeatother
 
-$if(highlighting-macros)$
-$highlighting-macros$
-
-% Workaround/bugfix from jannick0.
-% See https://github.com/jgm/pandoc/issues/4302#issuecomment-360669013)
-% or https://github.com/Wandmalfarbe/pandoc-latex-template/issues/2
-%
-% Redefine the verbatim environment 'Highlighting' to break long lines (with
-% the help of fvextra). Redefinition is necessary because it is unlikely that
-% pandoc includes fvextra in the default template.
-\usepackage{fvextra}
-\DefineVerbatimEnvironment{Highlighting}{Verbatim}{breaklines,fontsize=$if(code-block-font-size)$$code-block-font-size$$else$\small$endif$,commandchars=\\\{\}}
-$endif$
+% Make all verbatim environments use \small font.
+\usepackage{etoolbox}
+\makeatletter
+\patchcmd{\@verbatim}
+  {\verbatim@font}
+  {\verbatim@font\small}
+  {}{}
+\makeatother
 
 % Left-justify the document.
 \usepackage[document]{ragged2e}
@@ -410,16 +405,10 @@
 
 \lstdefinestyle{eisvogel_listing_style}{
   language         = java,
-$if(listings-disable-line-numbers)$
   xleftmargin      = 0.6em,
   framexleftmargin = 0.4em,
-$else$
-  numbers          = left,
-  xleftmargin      = 2.7em,
-  framexleftmargin = 2.5em,
-$endif$
   backgroundcolor  = \color{listing-background},
-  basicstyle       = \color{listing-text-color}\linespread{1.0}$if(code-block-font-size)$$code-block-font-size$$else$\small$endif$\ttfamily{},
+  basicstyle       = \color{listing-text-color}\linespread{1.0}\small\ttfamily{},
   breaklines       = true,
   frame            = single,
   framesep         = 0.19em,