Fixing some whitespace around a recent merge. That lead to some general clean-up, including removing tailing whitespace and removing some unneeded dependences. (details)

Started by upstream project Cforall Full Build build number 2856
originally caused by:

Revision: 7aa209e7409d14817d320fcccfbd6cda3e67303d
Repository: cforall@plg.uwaterloo.ca:software/cfa/cfa-cc