Restructure make_accumulator().