Minor code cleanup from last commit.