Merge "Modify to use new BacktraceMap iterator."