Some more static removal/tidying/etc.

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