Replace tricky and/or with straight-forward if:else:
1 file changed