Fixes to type inference, to fix some Spirit Island bugs

We'll see if this does it...