There was a logic error in the last modification!

I have hopefully fixed the logic. If I understood the program flow in
PHPlist better, I could probably simplify even more.