Logging is fixed -- there should now be enough here to fork into other projects.