Fixups based on previous commit.