For the record, I still really don't like the superfluous parentheses (we might as well use Lisp!) - but it's not going to stop me merging.