More random terminal cleanup while we're here