Comment 17 for bug 156697

Fixes up whitespace issues (uses 8 char tab) and removes asserts. In my opinion there is no huge rush in terms of stability to apply it. But it will look a lot neater.