Some more minor cleanup

I believe De Morgan's Law was invented to avoid expressions such as
these, lol