Removes unused CVS $Header$ tags and moves comments closer to where
they make sense as well as updates a few comments to match reality.