Merge some logging contexts and renumber