Cleans up some upgrade scripts, esp. when for upgrading calendars and forms over serveral iterations of import eql, etc...