This new series condenses all of the previously posted patches into new patch 1/2. The second patch is a new fix for parallel build in the haskell directory.