More fixes. Removed inference of nilable vars and instance vars because it was wrong.