Tweaks to demo programs to more closely match the original Haskell examples