Some cleanup changes from last night.