Refactor Builder TH code to use helpers in Cleanup.hs.