Minor tweaks to previous commit.