Update for recent changes in IPython