Some small clean-ups.