Code review comment for lp:~zorba-coders/zorba/bug-1180220

Juan reported some Windows compilation failures which are now fixed. There are a number of test failures but they seem to be the same set as without Paul's changes, so presumably no regressions.