Minor deprecations/tidying.

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