Minor adjustments to previous commit.