bird to haddock 4.0.0

Also performed some obvious substitutes to check haddock results: await, yield and run