Another tweak related to the last commit.