Misc minor clean-ups.