Started to reformat code to latest personal standards, which change every year or so. Sigh.