Fix spacing in ifs, here and elsewhere