[jhc] darcs patch: Fix parsing of @ patterns so that Data.H... (and 1 more)