Some changes to Inference.