Assorted tidying.

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