Minor rewriting of robot import/export classes