Fix var type inference2

Giving it another try.
You still have not addressed this comment. I don't have time right now to go through this whole diff checking everything I've commented to  make sure you really addressed it. The fact that I've found at least one comment you have not addressed is demonstration that this is still not ready for me to re-review.

_Please_, next time go through _all_ my comments and actually check that they have been addressed. You are wasting my time and slowing both of us down by asking me to review code that is not ready for re-review.