Rewrite branch soon maybe
…might need more innovation first.

Scrap the optimising branch - the "Add Another" message doesn't seem to show through the redirects.
Handle the _saveasnew case too so we redirect consistently.