Add: various improvements to DaoMake.