Tweaked changes in previous commit.