Some small clean-up.