Add Haskell expressions, update one, tweak another to build on Darwin