moving #if to Gap.hs.
moving #if to Gap.hs.
style only.
Bringing back MaybeT

This brings back a warning to be fixed.