[jhc] darcs patch: fix the 'do' 'where' parsing bug (and 1 more)