Tweaked some code added to previous commit.