Make ve.dm.AnnotationFactory a named function rather than an anonymous function

Trevor, this could be another target for a cleanup spree, maybe?

Change-Id: Id37903ef452ff9758ac6c70c9e21faaff66c6f0b