Eliminate Equality.hs-boot and Proxy.hs-boot by moving instances