This will help with typing in particular when we add it (allows using variable annotation syntax, fixed many bugs).

I will send a PR for this for the upcoming 1.0 release.