Save/restore cp_contract_operand in saved_scope

[JAChapmanII]

cp_contract_operand and cp_contract_return_value need saved and restored in the case of push_to_top_level and pop_from_top_level -- upstream suggests the best way to do this is probably through amending struct saved_scope.

[asutton]

This might also be simplified by a new approach to #4.