Stop needlessly checking for stop tokens twice
Stop needlessly checking for stop tokens twice

I must have just copy and pasted this together....

This is probably only wrapped in the bigger condition to only have
a single logging line, since I don't feel like resutructuring it
right now, we just preserve the check results and use them where
appropriate. :-)

wontfix-org/tues