Reorganize to allow clearer logging, should we need it some day.