Working on getting expansion to have identical results in the C and C++ versions for the large query file