libgpo: Tidy up some if statements