Since we are using Bitkeeper the CVS tags are useless. This patch
removes them and makes some whitespace cleanups.