Style: Tabs to spaces

Also fixup a mistake in the last commit.