Ben Gamari authored May 01, 2016 and Ben Gamari committed May 01, 2016

This shouldn't have any functional changes. It merely splits up what are
essentially three distinct codepaths which are melding together with
CPP.

At the moment I merely #include the implementation to use with CPP
although this really feels very yucky.

Reviewers: erikd, austin, simonmar

Reviewed By: simonmar

Subscribers: thomie

Differential Revision: https://phabricator.haskell.org/D2130