Old code now throwing up build error, and more clang format frigging

Old code now throwing up build error, and more clang format frigging #3274