Unify white space in .cpp and .h

Apologies to anyone affected, but my editor has trouble with mixed tabs
and spaces. Hopefully throwing it into its own commit makes this easy
to ignore.