Use new util methods, tidy a bit more.

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