More uniform logging.
More debug consolidation.