Diff reduce and plug double-frees

Sponsored-by: EMC / Isilon Storage Division