HG-838:  Cleanup, and slightly better build config and logging.