Cosmetic cleanups of stuff leftover from debugging.