Begin some of my "TODO:  get rid of this kludge @ PyDAWv4" cleanup...