More work on saving and restoring the Epiphany caret context