Merge-point-id is passed along to the make-merge-function
Fixed bug related to save-next-guard-id?

Previously, the save-next-guard-id? would never be reset after the guard-id was saved to the stack, so once save-next-guard-id? was set to #t, it would never be set back to #f.
Bugfix in code for updating bookkeeping