Preserve structure information in names of inlined variables