Some more minor clean up.