Fix omissions and typos in previous commit.