Nesting the Aids and Translog Demand Systems