Tidy some logic, fix weird line wrapping.

Change-Id: I90e6c24ea0bd1520a6dd9e2588016dc0b4e8b66e
Reviewed-on: http://gerrit.dmdirc.com/4083
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>