Fix: some type hints (tools/extractor, legacy patch stubs) (#285)

Fix: some type hints (tools/extractor, legacy patch stubs) (#285) #206