Revert "Remove extra brackets as suggested by Martin H, and fix up a comment which was missing a word"

This reverts commit b79aaaf4.