Minor improvement to last commit.