Merge "Fix dumping loop variable access."