More injection and tidying up.

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