Fixes for useafterfree's unwillingness to erase