Remove makeAdaptorAndInstance TH improvements from TODO because it is done.