Fixed some compiler/analyzer warnings.

- Sanitized some macros (they weren't going to cause problems, but
  better being safe than sorry)
- Parenthesized an incorrect expression in 6f6a6b3.
- Inverted an if(foo); else bar; statement in 6f6a6b3 to get rid of the
  empty expression (for legibility).
- Commented out some unnecessary lines as suggested by clang's static
  analyzer.

Signed-off-by: Haru <haru@dotalux.com>