Merge "pylint fixes: remove redundant parens, fix comparison order"