The testsuite uses -s to hide them, and this way we can see what's
happening when running make by hand.

This will help the Cabal tests to work (although there are still more
issues to fix).

Also fixes whitespace.