Some cleanup with static.