Merge "Modernize logging slightly." into main