diff --git a/lib/src/lexer.c b/lib/src/lexer.c
index f181946a..78f216d2 100644
--- a/lib/src/lexer.c
+++ b/lib/src/lexer.c
@@ -424,10 +424,7 @@ void ts_lexer_finish(Lexer *self, uint32_t *lookahead_end_byte) {
   // If the token ended at an included range boundary, then its end position
   // will have been reset to the end of the preceding range. Reset the start
   // position to match.
-  if (
-    self->token_end_position.bytes < self->token_start_position.bytes ||
-    point_lt(self->token_end_position.extent, self->token_start_position.extent)
-  ) {
+  if (self->token_end_position.bytes < self->token_start_position.bytes) {
     self->token_start_position = self->token_end_position;
   }
 
diff --git a/lib/src/subtree.c b/lib/src/subtree.c
index d5a4f869..683b6eee 100644
--- a/lib/src/subtree.c
+++ b/lib/src/subtree.c
@@ -157,6 +157,7 @@ static inline bool ts_subtree_can_inline(Length padding, Length size, uint32_t l
     padding.bytes < TS_MAX_INLINE_TREE_LENGTH &&
     padding.extent.row < 16 &&
     padding.extent.column < TS_MAX_INLINE_TREE_LENGTH &&
+    size.bytes < TS_MAX_INLINE_TREE_LENGTH &&
     size.extent.row == 0 &&
     size.extent.column < TS_MAX_INLINE_TREE_LENGTH &&
     lookahead_bytes < 16;