Clang is more intelligent than GCC, lets use its smarts
Further fixes for errors that clang noted. Some of them. Eeep.