OK, I've just added a bit of logic to `matches_typeset` in order to pass the test.  Merging after tests pass.