Ran astyle. Hopefully after the last commit the compiler won't complain.