Cleaning up the code from the last pull request

I don't know what I was thinking when I put that useless `or` in there.
Mental note: Don't do pull requests again when I'm sleepy.