Another small cleanup commit.