SI-8226 Deduplicate JavaTokens/ScalaTokens