Nested ifs have to die, this commit kills one of them

No logic changes, but this might make the code a bit cleaner.