Another minor clean-up.