clang on mac format fixes

recent formatting changes somehow broke the mac-clang build, this gets it building again.