Minor cody clean-ups.