Handle deletion of outer and inner delimiters better generally