Merge "Comment a gnu++17 that should probably be left alone." into main