Comeback Magpie set for new AFL deal