Followup r114270 (essentially reverts it), and r114233, use class member variables...