Deal with more agressive gcov 7.1; Reindent