snippets: try to handle delete and marks moving a bit better.