diff --git a/cli/src/generate/char_tree.rs b/cli/src/generate/char_tree.rs
index af86f28e..2de5e832 100644
--- a/cli/src/generate/char_tree.rs
+++ b/cli/src/generate/char_tree.rs
@@ -1,5 +1,8 @@
 use std::ops::Range;
 
+/// A set of characters represented as a balanced binary tree of comparisons.
+/// This is used as an intermediate step in generating efficient code for
+/// matching a given character set.
 #[derive(PartialEq, Eq)]
 pub enum CharacterTree {
     Yes,
diff --git a/cli/src/generate/render.rs b/cli/src/generate/render.rs
index e5d0e7dd..d6e32cf3 100644
--- a/cli/src/generate/render.rs
+++ b/cli/src/generate/render.rs
@@ -720,14 +720,12 @@ impl Generator {
                     info.index
                 );
                 indent!(self);
-                add_line!(self, "return");
-                indent!(self);
                 add_whitespace!(self);
+                add!(self, "return ");
                 let tree = CharacterTree::from_ranges(&info.ranges);
                 self.add_character_tree(tree.as_ref());
                 add!(self, ";\n");
                 dedent!(self);
-                dedent!(self);
                 add_line!(self, "}}");
                 add_line!(self, "");
             }