Fix clang-tidy warnings about function definitions in headers.

Clang-tidy is generating warnings for this.

Also clang-formatted, since the weird indenting made the original hard to read.