Small rewrite of the previous commit.