Fix all of last night's nasty hacks.