rebase commits for cleaner history.

[deadPix3l]

Some commits make single line changes, only to have the same file changed again in the next commits. Specifically, the first commit contains only a single change, which is immediately undone in the second.
This commit, need not exist at all. I am suggesting for clarity, that small commits be compressed and needless commits be removed entirely using rebase.