Follow-up changes to an earlier commit.