Further improvements to follow changes mode.

At this point, the implementation works as I intended.