Some fixups in the previous commit.