Simplify makeLenses
Make TH code more readable.