This causes issues such as copygirl/BetterStorage#183.

I'd go through, fix it and make a PR, but setting everything up, making sure all functions who need the annotations have one, and testing is going to take such a long time. Not to mention BetterStorage isn't 1.7 yet. I'll leave it up to the ones who're familiar with the code.

The trouble with this is, while you are indeed correct, it's gotten to a point where there's so many functions without the annotations that it's gotten to a point where it'd be far easier to solve on a case-by-case basis. So let me know if this is still occurring with BetterStorage 1.7 and i'll take a look.