Various bits of tidying up.

Change-Id: I08c0f6fc74d448051145807275426395629f50be
Reviewed-on: http://gerrit.dmdirc.com/3686
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Fix various inspection errors.

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