Adjust for some changes to IPython code based on our suggestions.