more refcounting restructuring fallout