Adjust to recent changes in PISM.