master: Minor cleanup using or rather than if