Various small clean-ups and additions.