Bug #4730

Fixing Whitepsace

Here it is, as promised. I ran some shell commands to strip trailing whitespace, and then tabs to spaces. I then went through the files by hand and fixed some weird indentation that this caused due to inconsistencies. make test says everything's all good.