You should be taking money out at your chosen rate, not depending on how those companies choose to allocate money between dividends vs. buybacks vs. cash piles vs. reinvestment. So treating dividends as reinvested by default makes sense to me.