Fix expression binding and type inference.