Two spaces -> Four spaces

Four spaces is rust style. This is annoying, I know, but it's better to do it
early (now) then much later.

This will need to be rebased after the other PRs are merged.