Issue #3416798 by GafgarionMorua, arunkumark, larowlan, smustgrave, DamienMcKenna: Refactor the breadcrumb generation "catch" code