Fix var type inference2

Giving it another try.
I'm not going to fight about this, but only because when I have time to work on the new kast, location information will be completely redone.