More minor clean-up.