Forward double

Two other changes needed to build on ghc-7.8.  Not sure you really want to merge them however.