Fix breakage on recent trunk.