Update 2 methods to use the aid typedef.