Slight simplification of the previous commit.