Propagate annotations around a bit.

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