Clean up, remove hacks and stick with ::select for now.