Improve previous commit.
Further improvements.