Merge "Move map data into backtrace data proper."