Be conservative about a couple more ->data fields

you never know when the garbage collector might run, so get these set ASAP