Checkpoint to add logging.
Added a logging framework.
Back out unrelated changes.
Self-review plus gcc build fix.