More fixes with parens and conditions...