Actually--this should still (also) be in the `if (changed)`, right?