Some minor clean-up.