... Well this is all that this discussion really set out to achieve: consistent 4-space indentation, remove all tabs, get rid of other spurious whitespace. So, yes, let us stop at that.
+1, keep it simple!
IIUC the whole point is to have easy to work with CVS diffs, the rest is largely personal taste, mostly impossible to agree on.
"diff -b" also helps ignore "reasonable" whitespace differences.
-Bertrand