AAI: remove unitdefid-1 weirdness / convert unitlist to std::vector