Minor cleanup from last commit.