Tabs -> spaces, for consistency.
Re-ordering to fix MSVC build.