More assorted fixes

This brings another fix to RedundantThisQualifierIssue so that it no longer creates conflicting variable declarations,
the same fix for redundant 'else' and finally some improvements to the formatter.

The commit fixing the formatter is big and really several different improvements, but they are a little intertwined to there is no straight forward way of making them separate commits unfortunately.