diff --git a/scripts/count.sh b/scripts/count.sh
@@ -84,16 +84,16 @@ all() {

 # Just the parser
 parser() {
+  echo 'AST and IDs'
+  wc -l osh/osh.asdl core/id_kind.py | sort -n
+  echo
+
  # I'm counting brace detection/expansion here because it doesn't depend on
  # runtime info.
  echo 'Lexer/Parser'
  wc -l osh/{*_parse.py,lex.py,parse_lib.py} core/{word,braces}.py | sort -n
  echo

-  echo 'AST and IDs'
-  wc -l osh/osh.asdl core/id_kind.py | sort -n
-  echo
-
  echo 'Common Algorithms'
  wc -l core/{tdop,lexer}.py | sort -n
  echo
@@ -125,7 +125,7 @@ runtime() {
  echo

  echo 'Libraries'
-  wc -l core/{args,glob_,legacy}.py | sort -n
+  wc -l core/{args,glob_,legacy,libstr}.py | sort -n
  echo
 }

diff --git a/test/gold.sh b/test/gold.sh
@@ -90,6 +90,8 @@ glob() { _compare gold/glob.sh; }
 no-op() { _compare scripts/count.sh; }
 complex-here-docs() { _compare gold/complex-here-docs.sh; }

+strip-op-char-class() { _compare gold/strip-op-char-class.sh; }
+

 # Not implemented in osh.
 dollar-sq() { _compare gold/dollar-sq.sh; }