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