Test Plan:
Validated locally, but skipped perf tests as there's a
framework-related error
there.

Reviewers: simonmar, bgamari, erikd

Reviewed By: simonmar

Subscribers: rwbarton, carter

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