Modify bookmarks.
Use the new bookmarks, etc.
Don't use normal-erase anymore.
Define source-skeleton with optional tangle.