Added forgotten wrapping for annotation values on annotations.