Track last instead of next update time, and related improvements.