Improvements for the previous commit.