Yes, that'll be one of the challenges. It will be easier for some features (e.g. the parameter name provider) than for others (e.g. type annotations). For the latter I can't really see a good way how it could be done without a branch, but maybe someone has an idea for this.