Tighten up debugging code.