Remove unused requires in TR
Fix with-type when used at the top-level

In some situations, with-type would fail to clean up its
state before reporting an error at the top-level.