Handle deletion of outer and inner delimiters better generally (fixes #18)