Some cleanup on last commit.