Debug cleanup, mostly.