RE: Haddock's -s switch is broken