When we merged Alex’s patch to not pass all columns through the query context, Teddy and I chased down a bunch of places we were missing those

additional

and

index

column tags. My memory at the time, was that there were cases that neither felt quite right,

optimized

would have been a better fit. But we can basically fudge anything with

additional

.