Ben Gamari authored Oct 25, 2017 and Ben Gamari committed Oct 25, 2017

Begins to fix #14214.

[skip ci]

Test Plan: Read it.

Reviewers: austin

Subscribers: rwbarton, thomie

GHC Trac Issues: #14214

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