(Bug 5077) Fixes following code review.  Primarily the ruthless removal of brackets.
Z