RF: Haskell cleanup
BF: Fix usage.