Also switched to using Haskell Bools (rather than CPP) to en/disable it, so it shouldn't break again in the future.