Remove some ifdefs in favour of Haskell tests