I really hate to do this, but... We're merging to the staging repo, and that uses jcheck, so we really have to follow jcheck rules for whitespace. That means I'm going to have to clean up the source files in HotSpot. All of them. So it'll make an awful mess of the diffs. I think there's no choice, though. Opinions? Andrew.