More attempt to avoid destroy()-ing a widget twice.  Fix #162.