Sprinkle some @Nullables around.

Other minor tidying.

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