Improve and simplify late data logic.