Much simpler SPC/DEL handling