Simplify B.hs and D.hs