Some cleanup from my previous commit.