Bug 1048598 adding another layer of parenthesis and removing an unnecessary else statement