Some more minor cleanup.