Some more clean-up.