Reduce the number of raw-type related warnings in aai-common