Minor code optimizations

... by using the defined-or operator. That makes the code more readable.