More NULL checks on destroy.  Switched to -O2.