More type inference