@abbeyj Do you know what is going on here? I couldn't get clang indexing to work without this change, but it looks obviously wrong to me.

In any case, we probably don't want to land this change, I'll strip it out with any other requested changes.