Though I'm not a fan of the tab/spacing here, let's not change it (or do it in a separate patch). Future merges with codebutler's fork would be a pain.

Try to avoid whitespace changes in general, or put them in a separate pull request so they can be reviewed as they are separate issues. Commits and pull requests should tackle one problem at a time, rather than bunch up a number of different changes.