Fixed minor bugs in annotation-dumping task.