Fix if()s to follow newly enforced code style conventions. Sorry.