Completed modifications to saving and restoration to account for the
boundary.