I'm taking this patch, but in general I prefer it if we don't mix white space cleanup and other changes (I know, I'm guilty of doing this myself at times...) /D