First pass at improving debug output.