Refactor EngineerStore unarchive. All tests passing now.