Remove some redundant logical expressions
Reviewed-by: NEmilia Kasper <emilia@silkandcyanide.net>