Added parens to sub-expressions to remove compiler warnings. Fixes #3