Minor cleanup; better initialization of copy_of_var_addr.
Fix minor bug in end-case of de deleting.
Authored by: dwarren 2015-09-09
Parent: [r8466]
Child: [r8468]