Fixes to new title break handling mechanism

Introduction of re-nesting cleanup infrastructure