Silence warning about mixing || in &&, fix up 80-cols.