Some small amendments to my previous commit.