Cleanup per omarkj's advice.