Fix #357: Save mark-and-keyword connections