more assigning-variables-by-reference cleanup