Rejigging of form processing due to issues with session variables and the new "Edit Imported Content" feature.