Add braces around || in && to pacify GCC.