[jhc] darcs patch: improve the parser to accept a lot more ... (and 3 more)