more style/consistency fixes

More whitespaces fixes, for the C files that aren't in `src/` and for this weird `else` syntax that I missed before.